| 1 |
commit: b9051664bb3c37b2894d94cf655adfdae7862bf8 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 2 20:47:54 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 2 20:47:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b9051664 |
| 7 |
|
| 8 |
tests: workound env issue on Travis |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
tests/init.sh.in | 8 ++++++-- |
| 13 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/tests/init.sh.in b/tests/init.sh.in |
| 16 |
index 8f52086..c5cd8f3 100644 |
| 17 |
--- a/tests/init.sh.in |
| 18 |
+++ b/tests/init.sh.in |
| 19 |
@@ -31,8 +31,12 @@ export TZ='UTC 0' |
| 20 |
# create symlinks for applets |
| 21 |
q -i -q |
| 22 |
|
| 23 |
-# inject valgrind wrapper if necessary |
| 24 |
-if [[ -n ${Q_RUN_WITH_VALGRIND} ]] ; then |
| 25 |
+# inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu |
| 26 |
+# used by Travis segfaults on qmanifest, so disable there to be able to |
| 27 |
+# run the rest regularly |
| 28 |
+dovalgrind=${Q_RUN_WITH_VALGRIND} |
| 29 |
+[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind= |
| 30 |
+if [[ -n ${dovalgrind} ]] ; then |
| 31 |
chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind" |
| 32 |
for f in @abs_top_builddir@/q?* ; do |
| 33 |
[[ -L ${f} ]] || continue |
Archives