Bladeren bron

Move tests again from core to main

As advised by @reduz, as tests depend on other libs.
Rémi Verschelde 8 jaren geleden
bovenliggende
commit
8b7a86ec7b

+ 0 - 1
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)
 

+ 2 - 0
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])

+ 1 - 1
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"

+ 0 - 0
core/tests/SCsub → main/tests/SCsub


+ 0 - 0
core/tests/test_containers.cpp → main/tests/test_containers.cpp


+ 0 - 0
core/tests/test_containers.h → main/tests/test_containers.h


+ 0 - 0
core/tests/test_gdscript.cpp → main/tests/test_gdscript.cpp


+ 0 - 0
core/tests/test_gdscript.h → main/tests/test_gdscript.h


+ 0 - 0
core/tests/test_gui.cpp → main/tests/test_gui.cpp


+ 0 - 0
core/tests/test_gui.h → main/tests/test_gui.h


+ 0 - 0
core/tests/test_image.cpp → main/tests/test_image.cpp


+ 0 - 0
core/tests/test_image.h → main/tests/test_image.h


+ 0 - 0
core/tests/test_io.cpp → main/tests/test_io.cpp


+ 0 - 0
core/tests/test_io.h → main/tests/test_io.h


+ 0 - 0
core/tests/test_main.cpp → main/tests/test_main.cpp


+ 0 - 0
core/tests/test_main.h → main/tests/test_main.h


+ 0 - 0
core/tests/test_math.cpp → main/tests/test_math.cpp


+ 0 - 0
core/tests/test_math.h → main/tests/test_math.h


+ 0 - 0
core/tests/test_physics.cpp → main/tests/test_physics.cpp


+ 0 - 0
core/tests/test_physics.h → main/tests/test_physics.h


+ 0 - 0
core/tests/test_physics_2d.cpp → main/tests/test_physics_2d.cpp


+ 0 - 0
core/tests/test_physics_2d.h → main/tests/test_physics_2d.h


+ 0 - 0
core/tests/test_render.cpp → main/tests/test_render.cpp


+ 0 - 0
core/tests/test_render.h → main/tests/test_render.h


+ 0 - 0
core/tests/test_shader_lang.cpp → main/tests/test_shader_lang.cpp


+ 0 - 0
core/tests/test_shader_lang.h → main/tests/test_shader_lang.h


+ 0 - 0
core/tests/test_sound.cpp → main/tests/test_sound.cpp


+ 0 - 0
core/tests/test_sound.h → main/tests/test_sound.h


+ 0 - 0
core/tests/test_string.cpp → main/tests/test_string.cpp


+ 0 - 0
core/tests/test_string.h → main/tests/test_string.h