maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #40726 from akien-mga/scons-tests-self-contained

Browse source 
SCons: Build tests/ and main/ in cloned environments
This commit is contained in:
Rémi Verschelde 2020-07-26 16:57:06 +02:00 committed by GitHub
parent 1a829621e3 a3a980eb0d
commit e7a56a2454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -593,8 +593,6 @@ if selected_platform in platform_list:
env.Append(CPPDEFINES=["PTRCALL_ENABLED"])
if env["tools"]:
env.Append(CPPDEFINES=["TOOLS_ENABLED"])
if env["tests"]:
env.Append(CPPDEFINES=["TESTS_ENABLED"])
if env["disable_3d"]:
if env["tools"]:
print(
@ -650,10 +648,6 @@ if selected_platform in platform_list:
}
)
# Enable test framework globally and inform it of configuration method.
if env["tests"]:
env.Append(CPPDEFINES=["DOCTEST_CONFIG_IMPLEMENT"])
scons_cache_path = os.environ.get("SCONS_CACHE")
if scons_cache_path != None:
CacheDir(scons_cache_path)

21
main/SCsub
View file

@ -7,18 +7,23 @@ import main_builders
env.main_sources = []
env.add_source_files(env.main_sources, "*.cpp")
env_main = env.Clone()
env.Depends("#main/splash.gen.h", "#main/splash.png")
env.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash))
env_main.add_source_files(env.main_sources, "*.cpp")
env.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png")
env.CommandNoCache(
if env["tests"]:
env_main.Append(CPPDEFINES=["TESTS_ENABLED"])
env_main.Depends("#main/splash.gen.h", "#main/splash.png")
env_main.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash))
env_main.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png")
env_main.CommandNoCache(
"#main/splash_editor.gen.h", "#main/splash_editor.png", run_in_subprocess(main_builders.make_splash_editor)
)
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))
env_main.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
env_main.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon))
lib = env.add_library("main", env.main_sources)
lib = env_main.add_library("main", env.main_sources)
env.Prepend(LIBS=[lib])

10
tests/SCsub
View file

@ -3,7 +3,13 @@
Import("env")
env.tests_sources = []
env.add_source_files(env.tests_sources, "*.cpp")
lib = env.add_library("tests", env.tests_sources)
env_tests = env.Clone()
# Enable test framework and inform it of configuration method.
env_tests.Append(CPPDEFINES=["DOCTEST_CONFIG_IMPLEMENT"])
env_tests.add_source_files(env.tests_sources, "*.cpp")
lib = env_tests.add_library("tests", env.tests_sources)
env.Prepend(LIBS=[lib])