Browse Source

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

SCons: do not build tests with tools=no
Rémi Verschelde 6 years ago
parent
commit
d1ecc15c11
2 changed files with 3 additions and 3 deletions
  1. 2 1
      main/SCsub
  2. 1 2
      main/main.cpp

+ 2 - 1
main/SCsub

@@ -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
main/main.cpp

@@ -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 != "") {