Move core engine tests to main

(cherry picked from commits 790f629e5e and 8b7a86ec7b)
2024-12-11 21:53:19 +00:00 · 2017-01-08 14:08:18 +01:00 · 2017-01-08 14:08:18 +01:00 · ff490e42da
commit ff490e42da
parent b1fc41a301
39 changed files with 4 additions and 8 deletions
--- a/2
+++ b/2
@ -1,3 +1,4 @@
+
 #!/usr/bin/env python

 EnsureSConsVersion(0, 14)
@ -360,7 +361,6 @@ if selected_platform in platform_list:
    SConscript("scene/SCsub")
    SConscript("tools/SCsub")
    SConscript("drivers/SCsub")
-    SConscript("bin/SCsub")

    SConscript("modules/SCsub")
    SConscript("main/SCsub")
--- a/bin/SCsub
+++ b/bin/SCsub
@ -1,6 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-Export('env')
-
-SConscript('tests/SCsub')
--- a/main/SCsub
+++ b/main/SCsub
@ -7,6 +7,8 @@ env.add_source_files(env.main_sources, "*.cpp")

 Export('env')

+SConscript('tests/SCsub')
+
 lib = env.Library("main", env.main_sources)

 env.Prepend(LIBS=[lib])
--- a/main/main.cpp
+++ b/main/main.cpp
@ -47,7 +47,7 @@
 #include "script_language.h"
 #include "io/resource_loader.h"

-#include "bin/tests/test_main.h"
+#include "main/tests/test_main.h"
 #include "os/dir_access.h"
 #include "core/io/ip.h"
 #include "scene/resources/packed_scene.h"
--- a/main/tests/SCsub
+++ b/main/tests/SCsub
--- a/main/tests/test_containers.cpp
+++ b/main/tests/test_containers.cpp
--- a/main/tests/test_containers.h
+++ b/main/tests/test_containers.h
--- a/main/tests/test_detailer.cpp
+++ b/main/tests/test_detailer.cpp
--- a/main/tests/test_detailer.h
+++ b/main/tests/test_detailer.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_image.cpp
+++ b/main/tests/test_image.cpp
--- a/main/tests/test_image.h
+++ b/main/tests/test_image.h
--- a/main/tests/test_io.cpp
+++ b/main/tests/test_io.cpp
--- a/main/tests/test_io.h
+++ b/main/tests/test_io.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_misc.cpp
+++ b/main/tests/test_misc.cpp
--- a/main/tests/test_misc.h
+++ b/main/tests/test_misc.h
--- a/main/tests/test_particles.cpp
+++ b/main/tests/test_particles.cpp
--- a/main/tests/test_particles.h
+++ b/main/tests/test_particles.h
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
--- a/main/tests/test_physics.h
+++ b/main/tests/test_physics.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_python.cpp
+++ b/main/tests/test_python.cpp
--- a/main/tests/test_python.h
+++ b/main/tests/test_python.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_sound.cpp
+++ b/main/tests/test_sound.cpp
--- a/main/tests/test_sound.h
+++ b/main/tests/test_sound.h
--- a/main/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
--- a/main/tests/test_string.h
+++ b/main/tests/test_string.h