Move core engine tests to core/

2017-01-08 14:08:18 +01:00 · 2017-01-08 14:08:18 +01:00 · 790f629e5e
parent 28d7486267
commit 790f629e5e
31 changed files with 4 additions and 9 deletions
--- a/4
+++ b/4
@ -1,3 +1,4 @@
+
 #!/usr/bin/env python

 EnsureSConsVersion(0, 14)
@ -347,7 +348,7 @@ if selected_platform in platform_list:

    if (env['verbose'] == 'no'):
        methods.no_verbose(sys, env)
-        
+
    if (True): # FIXME: detect GLES3
        env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )

@ -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/core/SCsub
+++ b/core/SCsub
@ -61,6 +61,7 @@ SConscript('os/SCsub')
 SConscript('math/SCsub')
 SConscript('io/SCsub')
 SConscript('bind/SCsub')
+SConscript('tests/SCsub')

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

--- a/core/tests/SCsub
+++ b/core/tests/SCsub
--- a/core/tests/test_containers.cpp
+++ b/core/tests/test_containers.cpp
--- a/core/tests/test_containers.h
+++ b/core/tests/test_containers.h
--- a/core/tests/test_gdscript.cpp
+++ b/core/tests/test_gdscript.cpp
--- a/core/tests/test_gdscript.h
+++ b/core/tests/test_gdscript.h
--- a/core/tests/test_gui.cpp
+++ b/core/tests/test_gui.cpp
--- a/core/tests/test_gui.h
+++ b/core/tests/test_gui.h
--- a/core/tests/test_image.cpp
+++ b/core/tests/test_image.cpp
--- a/core/tests/test_image.h
+++ b/core/tests/test_image.h
--- a/core/tests/test_io.cpp
+++ b/core/tests/test_io.cpp
--- a/core/tests/test_io.h
+++ b/core/tests/test_io.h
--- a/core/tests/test_main.cpp
+++ b/core/tests/test_main.cpp
--- a/core/tests/test_main.h
+++ b/core/tests/test_main.h
--- a/core/tests/test_math.cpp
+++ b/core/tests/test_math.cpp
--- a/core/tests/test_math.h
+++ b/core/tests/test_math.h
--- a/core/tests/test_physics.cpp
+++ b/core/tests/test_physics.cpp
--- a/core/tests/test_physics.h
+++ b/core/tests/test_physics.h
--- a/core/tests/test_physics_2d.cpp
+++ b/core/tests/test_physics_2d.cpp
--- a/core/tests/test_physics_2d.h
+++ b/core/tests/test_physics_2d.h
--- a/core/tests/test_render.cpp
+++ b/core/tests/test_render.cpp
--- a/core/tests/test_render.h
+++ b/core/tests/test_render.h
--- a/core/tests/test_shader_lang.cpp
+++ b/core/tests/test_shader_lang.cpp
--- a/core/tests/test_shader_lang.h
+++ b/core/tests/test_shader_lang.h
--- a/core/tests/test_sound.cpp
+++ b/core/tests/test_sound.cpp
--- a/core/tests/test_sound.h
+++ b/core/tests/test_sound.h
--- a/core/tests/test_string.cpp
+++ b/core/tests/test_string.cpp
--- a/core/tests/test_string.h
+++ b/core/tests/test_string.h
--- 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 "core/tests/test_main.h"
 #include "os/dir_access.h"
 #include "core/io/ip.h"
 #include "scene/resources/packed_scene.h"