Merge pull request #32365 from Xrayez/scons-no-tests-release

SCons: do not build tests with tools=no
This commit is contained in:
Rémi Verschelde
2019-09-27 08:15:00 +02:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -1
View File
@@ -28,7 +28,8 @@ env.CommandNoCache("#main/splash_editor.gen.h", "#main/splash_editor.png", run_i
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))
SConscript('tests/SCsub')
if env["tools"]:
SConscript('tests/SCsub')
lib = env.add_library("main", env.main_sources)
env.Prepend(LIBS=[lib])
+1 -2
View File
@@ -1457,12 +1457,11 @@ bool Main::start() {
};
if (test != "") {
#ifdef DEBUG_ENABLED
#ifdef TOOLS_ENABLED
main_loop = test_main(test, args);
if (!main_loop)
return false;
#endif
} else if (script != "") {