Rename sandbox and tests dirs

CMakeLists.txt

@@ -401,7 +401,7 @@ target_link_libraries(anki ${THIRD_PARTY_LIBS})
 # AnKi extra                                                                   #
 ################################################################################
 if(ANKI_BUILD_TESTS)
-	add_subdirectory(tests)
+	add_subdirectory(Tests)
 endif()
 
 if(ANKI_BUILD_TOOLS)
@@ -409,7 +409,7 @@ if(ANKI_BUILD_TOOLS)
 endif()
 
 if(ANKI_BUILD_SANDBOX)
-	add_subdirectory(sandbox)
+	add_subdirectory(Sandbox)
 endif()
 
 if(ANKI_BUILD_SAMPLES)

Sandbox/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_executable(Sandbox Main.cpp)
+target_link_libraries(Sandbox anki)
+installExecutable(Sandbox)

Tests/CMakeLists.txt

@@ -0,0 +1,10 @@
+file(GLOB_RECURSE TESTS_SOURCES *.cpp)
+file(GLOB_RECURSE TESTS_HEADERS *.h)
+
+include_directories("..")
+
+add_executable(Tests ${TESTS_SOURCES} ${TESTS_HEADERS})
+target_compile_definitions(Tests PRIVATE -DANKI_SOURCE_FILE)
+target_link_libraries(Tests anki)
+
+installExecutable(Tests)

tests/framework/Framework.cpp → Tests/Framework/Framework.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include <iostream>
 #include <cstring>
 #include <malloc.h>

tests/gr/ClassGpuAllocator.cpp → Tests/Gr/ClassGpuAllocator.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 
 #include <anki/gr/utils/ClassGpuAllocator.h>
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <random>
 #include <algorithm>
 

tests/gr/Gr.cpp → Tests/Gr/Gr.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/Gr.h>
 #include <anki/core/NativeWindow.h>
 #include <anki/core/ConfigSet.h>

tests/gr/StackGpuAllocator.cpp → Tests/Gr/StackGpuAllocator.cpp

@@ -5,7 +5,7 @@
 
 #include <anki/gr/utils/StackGpuAllocator.h>
 #include <anki/util/ThreadHive.h>
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <algorithm>
 
 using namespace anki;

tests/Main.cpp → Tests/Main.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/Filesystem.h"
 
 using namespace anki;

tests/math/Math.cpp → Tests/Math/Math.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/Math.h"
 
 using namespace anki;

tests/renderer/TileAllocator.cpp → Tests/Renderer/TileAllocator.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/renderer/TileAllocator.h>
 
 namespace anki
@@ -71,4 +71,4 @@ ANKI_TEST(Renderer, TileAllocator)
 	}
 }
 
-} // end namespace anki
+} // end namespace anki

tests/resource/AsyncLoader.cpp → Tests/Resource/AsyncLoader.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/resource/AsyncLoader.h>
 #include <anki/util/HighRezTimer.h>
 #include <anki/util/Atomic.h>

tests/resource/ResourceFilesystem.cpp → Tests/Resource/ResourceFilesystem.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/resource/ResourceFilesystem.h"
 
 namespace anki
@@ -11,13 +11,13 @@ namespace anki
 
 ANKI_TEST(Resource, ResourceFilesystem)
 {
-	printf("Test requires the data dir\n");
+	printf("Test requires the Data dir\n");
 
 	HeapAllocator<U8> alloc(allocAligned, nullptr);
 	ResourceFilesystem fs(alloc);
 
 	{
-		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("data/dir/../dir/"));
+		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("Tests/Data/Dir/../Dir/"));
 		ResourceFilePtr file;
 		ANKI_TEST_EXPECT_NO_ERR(fs.openFile("subdir0/hello.txt", file));
 		StringAuto txt(alloc);
@@ -26,7 +26,7 @@ ANKI_TEST(Resource, ResourceFilesystem)
 	}
 
 	{
-		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("./data/dir.ankizip"));
+		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("./Tests/Data/Dir.ankizip"));
 		ResourceFilePtr file;
 		ANKI_TEST_EXPECT_NO_ERR(fs.openFile("subdir0/hello.txt", file));
 		StringAuto txt(alloc);

tests/resource/ResourceManager.cpp → Tests/Resource/ResourceManager.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/resource/DummyResource.h"
 #include "anki/resource/ResourceManager.h"
 #include "anki/core/ConfigSet.h"

tests/scene/Octree.cpp → Tests/Scene/Octree.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/scene/Octree.h>
 
 namespace anki

tests/script/LuaBinder.cpp → Tests/Script/LuaBinder.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/Script.h>
 #include <anki/Math.h>
 

tests/shader_compiler/ShaderProgramCompiler.cpp → Tests/ShaderCompiler/ShaderProgramCompiler.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/shader_compiler/ShaderProgramCompiler.h>
 #include <anki/util/ThreadHive.h>
 

tests/shader_compiler/ShaderProgramParser.cpp → Tests/ShaderCompiler/ShaderProgramParser.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/shader_compiler/ShaderProgramParser.h>
 
 ANKI_TEST(ShaderCompiler, ShaderCompilerParser)

tests/ui/Ui.cpp → Tests/Ui/Ui.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/core/ConfigSet.h>
 #include <anki/util/HighRezTimer.h>
 #include <anki/Ui.h>

tests/util/Allocator.cpp → Tests/Util/Allocator.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
-#include "tests/util/Foo.h"
+#include <Tests/Framework/Framework.h>
+#include <Tests/Util/Foo.h>
 #include "anki/util/Allocator.h"
 #include <string>
 #include <iostream>

tests/util/Atomic.cpp → Tests/Util/Atomic.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/Atomic.h>
 
 ANKI_TEST(Util, Atomic)

tests/util/BitSet.cpp → Tests/Util/BitSet.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/BitSet.h>
 #include <bitset>
 

tests/util/DynamicArray.cpp → Tests/Util/DynamicArray.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/DynamicArray.h>
 #include <vector>
 #include <ctime>

tests/util/Filesystem.cpp → Tests/Util/Filesystem.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/Filesystem.h"
 #include "anki/util/File.h"
 

tests/util/Foo.cpp → Tests/Util/Foo.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/util/Foo.h"
+#include <Tests/Util/Foo.h>
 
 int Foo::constructorCallCount = 0;
 int Foo::destructorCallCount = 0;

tests/util/HashMap.cpp → Tests/Util/HashMap.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
-#include "tests/util/Foo.h"
+#include <Tests/Framework/Framework.h>
+#include <Tests/Util/Foo.h>
 #include "anki/util/HashMap.h"
 #include "anki/util/DynamicArray.h"
 #include "anki/util/HighRezTimer.h"

tests/util/Hierarchy.cpp → Tests/Util/Hierarchy.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/Hierarchy.h"
 
 using namespace anki;

tests/util/HighRezTimer.cpp → Tests/Util/HighRezTimer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/HighRezTimer.h>
 #include <chrono>
 #include <thread>

tests/util/INotify.cpp → Tests/Util/INotify.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/INotify.h>
 #include <anki/util/Filesystem.h>
 

tests/util/List.cpp → Tests/Util/List.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
-#include "tests/util/Foo.h"
+#include <Tests/Framework/Framework.h>
+#include <Tests/Util/Foo.h>
 #include "anki/util/List.h"
 #include "anki/util/HighRezTimer.h"
 #include <list>

tests/util/Memory.cpp → Tests/Util/Memory.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
-#include "tests/util/Foo.h"
+#include <Tests/Framework/Framework.h>
+#include <Tests/Util/Foo.h>
 #include "anki/util/Memory.h"
 #include "anki/util/ThreadPool.h"
 #include <type_traits>

tests/util/Process.cpp → Tests/Util/Process.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/Process.h>
 #include <anki/util/File.h>
 #include <anki/util/HighRezTimer.h>

tests/util/Serializer.cpp → Tests/Util/Serializer.cpp

@@ -3,9 +3,9 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/Serializer.h>
-#include <tests/util/SerializerTest.h>
+#include <Tests/Util/SerializerTest.h>
 
 ANKI_TEST(Util, BinarySerializer)
 {

tests/util/SparseArray.cpp → Tests/Util/SparseArray.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/SparseArray.h>
 #include <anki/util/HighRezTimer.h>
 #include <unordered_map>

tests/util/String.cpp → Tests/Util/String.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/String.h"
 #include <string>
 

tests/util/StringList.cpp → Tests/Util/StringList.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/StringList.h"
 
 namespace anki
@@ -39,4 +39,4 @@ ANKI_TEST(Util, StringList)
 	}
 }
 
-} // end namespace anki
+} // end namespace anki

tests/util/Thread.cpp → Tests/Util/Thread.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "tests/framework/Framework.h"
+#include <Tests/Framework/Framework.h>
 #include "anki/util/Thread.h"
 #include "anki/util/StdTypes.h"
 #include "anki/util/HighRezTimer.h"

tests/util/ThreadHive.cpp → Tests/Util/ThreadHive.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/ThreadHive.h>
 #include <anki/util/HighRezTimer.h>
 #include <anki/util/System.h>

tests/util/Tracer.cpp → Tests/Util/Tracer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <tests/framework/Framework.h>
+#include <Tests/Framework/Framework.h>
 #include <anki/util/Tracer.h>
 #include <anki/core/CoreTracer.h>
 #include <anki/util/HighRezTimer.h>

sandbox/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_executable(sandbox Main.cpp)
-target_link_libraries(sandbox anki)
-installExecutable(sandbox)

tests/CMakeLists.txt

@@ -1,11 +0,0 @@
-file(GLOB_RECURSE TESTS_SOURCES *.cpp)
-file(GLOB_RECURSE TESTS_HEADERS *.h)
-
-include_directories("..")
-
-add_executable(anki_tests ${TESTS_SOURCES} ${TESTS_HEADERS})
-target_compile_definitions(anki_tests PRIVATE -DANKI_SOURCE_FILE)
-target_link_libraries(anki_tests anki)
-
-installExecutable(anki_tests)
-install(TARGETS anki_tests DESTINATION "${CMAKE_INSTALL_PREFIX}/tests")

tools/count_lines.sh

@@ -1 +1 @@
-wc -l `find ./anki ./tests ./sandbox ./tools ./samples -name '*.h' -o -name '*.hpp' -o -name '*.c' -o -name '*.cpp' -o -name '*.glsl' -o -name '*.py' -o -name '*.ankiprog' -o -name '*.xml' `
+wc -l `find ./anki ./Tests ./Sandbox ./tools ./samples -name '*.h' -o -name '*.hpp' -o -name '*.c' -o -name '*.cpp' -o -name '*.glsl' -o -name '*.py' -o -name '*.ankiprog' -o -name '*.xml' `

tools/format_source.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-files=(`find ./anki ./tests ./sandbox ./tools ./samples -name '*.h' -o -name '*.hpp' -o -name '*.c' -o -name '*.cpp' -o -name '*.glsl' -o -name '*.glslp' -o -name '*.ankiprog'`)
+files=(`find ./anki ./Tests ./Sandbox ./tools ./samples -name '*.h' -o -name '*.hpp' -o -name '*.c' -o -name '*.cpp' -o -name '*.glsl' -o -name '*.glslp' -o -name '*.ankiprog'`)
 
 filecount=${#files[@]}