diff options
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rw-r--r-- | test/integration/framework | 7 | ||||
| -rwxr-xr-x | test/integration/test-apt-update-simple | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/debian/tests/control b/debian/tests/control index d2b2e32c6..eaee89942 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -8,4 +8,4 @@ Depends: @, @builddeps@, dpkg (>= 1.20.8), fakeroot, wget, stunnel4, lsof, db-ut gnupg (>= 2) | gnupg2, gnupg1 | gnupg (<< 2), gpgv (>= 2) | gpgv2, gpgv1 | gpgv (<< 2), libfile-fcntllock-perl, python3-apt, aptitude, - valgrind, gdb-minimal | gdb + valgrind-if-available, gdb-minimal | gdb diff --git a/test/integration/framework b/test/integration/framework index 477aebd39..e054b4209 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -256,7 +256,12 @@ valgrind() { if [ "${CMD##*/}" = "$CMD" ]; then CMD="${APTCMDLINEBINDIR}/${CMD}" fi - runapt command valgrind -q --error-exitcode=7 "$CMD" "$@" + if command -v valgrind > /dev/null; then + runapt command valgrind -q --error-exitcode=7 "$CMD" "$@" + else + msgdebug "Running without valgrind" + runapt command "$CMD" "$@" + fi } lastmodification() { diff --git a/test/integration/test-apt-update-simple b/test/integration/test-apt-update-simple index 0d28034aa..6855f1d1f 100755 --- a/test/integration/test-apt-update-simple +++ b/test/integration/test-apt-update-simple @@ -34,9 +34,4 @@ main/i18n/Translation-de' aptget indextargets --format '$(METAKEY)' # Check that -o Acquire::Queue-Mode=access does not crash find rootdir/var/lib/apt/lists/ -type f -delete -if [ "$(command dpkg --print-architecture)" = "armhf" ]; then - msgskip "valgrind on armhf is broken" - testsuccess aptget update -o Acquire::Queue-Mode=access -else - testsuccess valgrind aptget update -o Acquire::Queue-Mode=access -fi +testsuccess valgrind aptget update -o Acquire::Queue-Mode=access |