浏览代码

Move core engine tests to main

(cherry picked from commits 790f629e5e1cccf721948b1153bb0dee139ac1a5
and 8b7a86ec7b7bc4bb115f45545aa062cba47022bc)
Rémi Verschelde 8 年之前
父节点
当前提交
ff490e42da

+ 1 - 1
SConstruct

@@ -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")

+ 0 - 6
bin/SCsub

@@ -1,6 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-Export('env')
-
-SConscript('tests/SCsub')

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

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


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


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


+ 0 - 0
bin/tests/test_detailer.cpp → main/tests/test_detailer.cpp


+ 0 - 0
bin/tests/test_detailer.h → main/tests/test_detailer.h


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


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


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


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


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


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


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


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


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


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


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


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


+ 0 - 0
bin/tests/test_misc.cpp → main/tests/test_misc.cpp


+ 0 - 0
bin/tests/test_misc.h → main/tests/test_misc.h


+ 0 - 0
bin/tests/test_particles.cpp → main/tests/test_particles.cpp


+ 0 - 0
bin/tests/test_particles.h → main/tests/test_particles.h


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


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


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


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


+ 0 - 0
bin/tests/test_python.cpp → main/tests/test_python.cpp


+ 0 - 0
bin/tests/test_python.h → main/tests/test_python.h


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


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


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


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


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


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


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


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