24 lines
719 B
Diff
24 lines
719 B
Diff
--- src/build_and_run_all_tests.orig 2015-09-28 04:36:59.000000000 +0200
|
|
+++ src/build_and_run_all_tests 2015-09-28 11:08:36.319383842 +0200
|
|
@@ -34,7 +34,7 @@
|
|
echo "Rebuilding..."
|
|
|
|
# Make sure correct qt installation is being used, by looking for '5.' in the version number
|
|
-VERSION5=`qmake -v | grep '5\.'`
|
|
+VERSION5=`qmake-qt5 -v | grep '5\.'`
|
|
if [ -z "$VERSION5" ]
|
|
then
|
|
echo "Need Qt5";
|
|
@@ -47,7 +47,9 @@
|
|
for t in "${tests[@]}"
|
|
do
|
|
sed "s/TEST/$t/g" engauge_test_template.pro >engauge_test.pro
|
|
- qmake engauge_test.pro
|
|
+ qmake-qt5 -makefile engauge_test.pro \
|
|
+ QMAKE_CFLAGS=RPM_OPT_FLAGS \
|
|
+ QMAKE_CXXFLAGS=$RPM_OPT_FLAGS
|
|
make all 2>>$LOGFILE >/dev/null
|
|
../bin/$t
|
|
if [ $argcount -ne 1 ]
|
|
|