Move tests to the top-level directory

This commit is contained in:
Andrii Doroshenko (Xrayez) 2020-07-26 00:06:07 +03:00
parent 6f292f906e
commit 9f649efe5d
32 changed files with 5 additions and 7 deletions

View file

@ -661,8 +661,7 @@ if selected_platform in platform_list:
Export("env")
# build subdirs, the build order is dependent on link order.
# Build subdirs, the build order is dependent on link order.
SConscript("core/SCsub")
SConscript("servers/SCsub")
SConscript("scene/SCsub")
@ -671,9 +670,11 @@ if selected_platform in platform_list:
SConscript("platform/SCsub")
SConscript("modules/SCsub")
if env["tests"]:
SConscript("tests/SCsub")
SConscript("main/SCsub")
SConscript("platform/" + selected_platform + "/SCsub") # build selected platform
SConscript("platform/" + selected_platform + "/SCsub") # Build selected platform.
# Microsoft Visual Studio Project Generation
if env["vsproj"]:

View file

@ -20,8 +20,5 @@ env.CommandNoCache(
env.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
env.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon))
if env["tests"]:
SConscript("tests/SCsub")
lib = env.add_library("main", env.main_sources)
env.Prepend(LIBS=[lib])

View file

@ -75,7 +75,7 @@
#include "servers/xr_server.h"
#ifdef TESTS_ENABLED
#include "main/tests/test_main.h"
#include "tests/test_main.h"
#endif
#ifdef TOOLS_ENABLED