Move core engine tests to core/

This commit is contained in:
Rémi Verschelde 2017-01-08 14:08:18 +01:00
parent 28d7486267
commit 790f629e5e
31 changed files with 4 additions and 9 deletions

View File

@ -1,3 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
EnsureSConsVersion(0, 14) EnsureSConsVersion(0, 14)
@ -347,7 +348,7 @@ if selected_platform in platform_list:
if (env['verbose'] == 'no'): if (env['verbose'] == 'no'):
methods.no_verbose(sys, env) methods.no_verbose(sys, env)
if (True): # FIXME: detect GLES3 if (True): # FIXME: detect GLES3
env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) 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("scene/SCsub")
SConscript("tools/SCsub") SConscript("tools/SCsub")
SConscript("drivers/SCsub") SConscript("drivers/SCsub")
SConscript("bin/SCsub")
SConscript("modules/SCsub") SConscript("modules/SCsub")
SConscript("main/SCsub") SConscript("main/SCsub")

View File

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

View File

@ -61,6 +61,7 @@ SConscript('os/SCsub')
SConscript('math/SCsub') SConscript('math/SCsub')
SConscript('io/SCsub') SConscript('io/SCsub')
SConscript('bind/SCsub') SConscript('bind/SCsub')
SConscript('tests/SCsub')
lib = env.Library("core", env.core_sources) lib = env.Library("core", env.core_sources)

View File

@ -47,7 +47,7 @@
#include "script_language.h" #include "script_language.h"
#include "io/resource_loader.h" #include "io/resource_loader.h"
#include "bin/tests/test_main.h" #include "core/tests/test_main.h"
#include "os/dir_access.h" #include "os/dir_access.h"
#include "core/io/ip.h" #include "core/io/ip.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"