Skip to content

Commit 6552ece

Browse files
updated test scripts
1 parent c144f56 commit 6552ece

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/test/testall.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ done
1616
[ -f Makefile ] && make -k distclean
1717
rm -f Makefile
1818

19-
qmake -r
19+
if which qmake6 >/dev/null; then
20+
qmake6 -r
21+
else
22+
qmake -r
23+
fi
24+
2025
make -j8
2126
if [ "$?" != 0 ]; then
2227
echo

tools/test/releasetest/releasetest

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,11 @@ test_app()
128128

129129
# QMake build check
130130
cd $APPROOT
131-
qmake -r || exit
131+
if which qmake6 >/dev/null; then
132+
qmake6 -r || exit
133+
else
134+
qmake -r || exit
135+
fi
132136
make -j4
133137
make || exit
134138
$TREEFROG --show-routes || exit

0 commit comments

Comments
 (0)