Move tests again from core to main

As advised by @reduz, as tests depend on other libs.
This commit is contained in:
Rémi Verschelde 2017-01-08 21:33:23 +01:00
parent 5bfa4227b3
commit 8b7a86ec7b
30 changed files with 3 additions and 2 deletions

View File

@ -61,7 +61,6 @@ 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

@ -7,6 +7,8 @@ env.add_source_files(env.main_sources, "*.cpp")
Export('env') Export('env')
SConscript('tests/SCsub')
lib = env.Library("main", env.main_sources) lib = env.Library("main", env.main_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

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 "core/tests/test_main.h" #include "main/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"