aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/init.sh.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8b67070..c44320b 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -37,6 +37,7 @@ q -i -q
dovalgrind=${Q_RUN_WITH_VALGRIND}
[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind=
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmerge ]] && dovalgrind=
if [[ -n ${dovalgrind} ]] ; then
chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
for f in @abs_top_builddir@/q?* ; do