aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-01-02 21:47:54 +0100
committerFabian Groffen <grobian@gentoo.org>2020-01-02 21:47:54 +0100
commitb9051664bb3c37b2894d94cf655adfdae7862bf8 (patch)
tree873b22062d03f00c21931518f0c97c14de931e69 /tests
parentmain: try to clear a warning on Travis platform (diff)
downloadportage-utils-b9051664bb3c37b2894d94cf655adfdae7862bf8.tar.gz
portage-utils-b9051664bb3c37b2894d94cf655adfdae7862bf8.tar.bz2
portage-utils-b9051664bb3c37b2894d94cf655adfdae7862bf8.zip
tests: workound env issue on Travis
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/init.sh.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8f52086..c5cd8f3 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -31,8 +31,12 @@ export TZ='UTC 0'
# create symlinks for applets
q -i -q
-# inject valgrind wrapper if necessary
-if [[ -n ${Q_RUN_WITH_VALGRIND} ]] ; then
+# inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu
+# used by Travis segfaults on qmanifest, so disable there to be able to
+# run the rest regularly
+dovalgrind=${Q_RUN_WITH_VALGRIND}
+[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind=
+if [[ -n ${dovalgrind} ]] ; then
chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
for f in @abs_top_builddir@/q?* ; do
[[ -L ${f} ]] || continue