godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 17a81a32d8 752debe204
commit d1ecc15c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/SCsub
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.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.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) lib = env.add_library("main", env.main_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

3
main/main.cpp
View File

@ -1457,12 +1457,11 @@ bool Main::start() {
}; };
if (test != "") { if (test != "") {
#ifdef DEBUG_ENABLED #ifdef TOOLS_ENABLED
main_loop = test_main(test, args); main_loop = test_main(test, args);
if (!main_loop) if (!main_loop)
return false; return false;
#endif #endif
} else if (script != "") { } else if (script != "") {