Move tests to the top-level directory

2020-07-26 00:06:07 +03:00 · 2020-07-26 00:06:07 +03:00 · 9f649efe5d
commit 9f649efe5d
parent 6f292f906e
32 changed files with 5 additions and 7 deletions
--- a/7
+++ b/7
@ -661,8 +661,7 @@ if selected_platform in platform_list:

    Export("env")

-    # build subdirs, the build order is dependent on link order.
-
+    # Build subdirs, the build order is dependent on link order.
    SConscript("core/SCsub")
    SConscript("servers/SCsub")
    SConscript("scene/SCsub")
@ -671,9 +670,11 @@ if selected_platform in platform_list:

    SConscript("platform/SCsub")
    SConscript("modules/SCsub")
+    if env["tests"]:
+        SConscript("tests/SCsub")
    SConscript("main/SCsub")

-    SConscript("platform/" + selected_platform + "/SCsub")  # build selected platform
+    SConscript("platform/" + selected_platform + "/SCsub")  # Build selected platform.

    # Microsoft Visual Studio Project Generation
    if env["vsproj"]:
--- a/main/SCsub
+++ b/main/SCsub
@ -20,8 +20,5 @@ env.CommandNoCache(
 env.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
 env.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon))

-if env["tests"]:
-    SConscript("tests/SCsub")
-
 lib = env.add_library("main", env.main_sources)
 env.Prepend(LIBS=[lib])
--- a/main/main.cpp
+++ b/main/main.cpp
@ -75,7 +75,7 @@
 #include "servers/xr_server.h"

 #ifdef TESTS_ENABLED
-#include "main/tests/test_main.h"
+#include "tests/test_main.h"
 #endif

 #ifdef TOOLS_ENABLED
--- a/main/tests/SCsub
+++ b/main/tests/SCsub
--- a/main/tests/test_astar.cpp
+++ b/main/tests/test_astar.cpp
--- a/main/tests/test_astar.h
+++ b/main/tests/test_astar.h
--- a/main/tests/test_basis.cpp
+++ b/main/tests/test_basis.cpp
--- a/main/tests/test_basis.h
+++ b/main/tests/test_basis.h
--- a/main/tests/test_class_db.cpp
+++ b/main/tests/test_class_db.cpp
--- a/main/tests/test_class_db.h
+++ b/main/tests/test_class_db.h
--- a/main/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
--- a/main/tests/test_gdscript.h
+++ b/main/tests/test_gdscript.h
--- a/main/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
--- a/main/tests/test_gui.h
+++ b/main/tests/test_gui.h
--- a/main/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
--- a/main/tests/test_main.h
+++ b/main/tests/test_main.h
--- a/main/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
--- a/main/tests/test_math.h
+++ b/main/tests/test_math.h
--- a/main/tests/test_oa_hash_map.cpp
+++ b/main/tests/test_oa_hash_map.cpp
--- a/main/tests/test_oa_hash_map.h
+++ b/main/tests/test_oa_hash_map.h
--- a/main/tests/test_ordered_hash_map.cpp
+++ b/main/tests/test_ordered_hash_map.cpp
--- a/main/tests/test_ordered_hash_map.h
+++ b/main/tests/test_ordered_hash_map.h
--- a/main/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
--- a/main/tests/test_physics_2d.h
+++ b/main/tests/test_physics_2d.h
--- a/main/tests/test_physics_3d.cpp
+++ b/main/tests/test_physics_3d.cpp
--- a/main/tests/test_physics_3d.h
+++ b/main/tests/test_physics_3d.h
--- a/main/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
--- a/main/tests/test_render.h
+++ b/main/tests/test_render.h
--- a/main/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
--- a/main/tests/test_shader_lang.h
+++ b/main/tests/test_shader_lang.h
--- a/main/tests/test_string.h
+++ b/main/tests/test_string.h
--- a/main/tests/test_validate_testing.h
+++ b/main/tests/test_validate_testing.h