[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     b9051664bb3c37b2894d94cf655adfdae7862bf8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 20:47:54 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 20:47:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b9051664

tests: workound env issue on Travis

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 8 ++++++--
 1 file 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