fix test scripts

Skycoder42 · Skycoder42 · commit bbdf9ebaa65d · 2020-02-23T18:54:59.000+01:00
diff --git a/tests/auto/restclient/tests.pri b/tests/auto/restclient/tests.pri
@@ -2,18 +2,16 @@ QT += core network restclient httpserver
 
 isEmpty(LIB_PWD): LIB_PWD = $$OUT_PWD/../testlib
 
-win32:CONFIG(release, debug|release): LIBS += -L$$LIB_PWD/release/ -ltestlib
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$LIB_PWD/debug/ -ltestlib
-else:unix: LIBS += -L$$LIB_PWD/ -ltestlib
+win32:!win32-g++:CONFIG(release, debug|release): LIBS += -L$$LIB_PWD/release/ -ltestlib
+else:win32:!win32-g++:CONFIG(debug, debug|release): LIBS += -L$$LIB_PWD/debug/ -ltestlib
+else: LIBS += -L$$LIB_PWD/ -ltestlib
 
 INCLUDEPATH += $$PWD/testlib
 DEPENDPATH += $$PWD/testlib
 
-win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$LIB_PWD/release/libtestlib.a
-else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$LIB_PWD/debug/libtestlib.a
-else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$LIB_PWD/release/testlib.lib
+win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$LIB_PWD/release/testlib.lib
 else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$LIB_PWD/debug/testlib.lib
-else:unix: PRE_TARGETDEPS += $$LIB_PWD/libtestlib.a
+else: PRE_TARGETDEPS += $$LIB_PWD/libtestlib.a
 
 DEFINES -= QT_ASCII_CAST_WARNINGS
 
diff --git a/tests/auto/testrun.pri b/tests/auto/testrun.pri
@@ -1,4 +1,4 @@
-win32:!ReleaseBuild:!DebugBuild {
+debug_and_release:!ReleaseBuild:!DebugBuild {
 	runtarget.target = run-tests
 	runtarget.CONFIG = recursive
 	runtarget.recurse_target = run-tests

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-win32:!ReleaseBuild:!DebugBuild {`
	`1`	`+debug_and_release:!ReleaseBuild:!DebugBuild {`
`2`	`2`	`runtarget.target = run-tests`
`3`	`3`	`runtarget.CONFIG = recursive`
`4`	`4`	`runtarget.recurse_target = run-tests`