Move tests again from core to main

As advised by @reduz, as tests depend on other libs.
2017-01-08 21:33:23 +01:00 · 2017-01-08 21:33:23 +01:00 · 8b7a86ec7b
parent 5bfa4227b3
commit 8b7a86ec7b
30 changed files with 3 additions and 2 deletions
--- a/core/SCsub
+++ b/core/SCsub
@ -61,7 +61,6 @@ SConscript('os/SCsub')
 SConscript('math/SCsub')
 SConscript('io/SCsub')
 SConscript('bind/SCsub')
-SConscript('tests/SCsub')

 lib = env.Library("core", env.core_sources)

--- 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 "core/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_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_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_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