implement a more generic ShowList method

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 5d949009fc61e0f117459526e10e4ec8765ef986..6ae5003f7b23deae28e3069ec50c31a8151d539f 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -143,6 +143,7 @@ gdb() {
        aptcache) CMD="apt-cache";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptcache) CMD="apt-cache";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;

+       aptftparchive) CMD="apt-ftparchive";;

        *) CMD="$1";;
        esac
        shift
        *) CMD="$1";;
        esac
        shift


@@ -1413,12 +1414,23 @@ testfailure() {
        else
                local EXITCODE=$?
                if expr match "$1" '^apt.*' >/dev/null; then
        else
                local EXITCODE=$?
                if expr match "$1" '^apt.*' >/dev/null; then

-                       if grep -q -E ' runtime error: ' "$OUTPUT"; then
-                               msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
-                       elif ! grep -q -E '^E: ' "$OUTPUT"; then
-                               msgfailoutput "run failed with exitcode ${EXITCODE}, but with no errors" "$OUTPUT" "$@"
+                       if [ "$1" = 'aptkey' ]; then
+                               if grep -q -E " Can't check signature: " "$OUTPUT" || \
+                                       grep -q -E " BAD signature from " "$OUTPUT"; then
+                                       msgpass
+                               else
+                                       msgfailoutput "run failed with exitcode ${EXITCODE}, but no signature error" "$OUTPUT" "$@"
+                               fi

                        else
                        else

-                               msgpass
+                               if grep -q -E ' runtime error: ' "$OUTPUT"; then
+                                       msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
+                               elif grep -q -E '==ERROR' "$OUTPUT"; then
+                                       msgfailoutput 'compiler sanitizers reported errors' "$OUTPUT" "$@"
+                               elif ! grep -q -E '^E: ' "$OUTPUT"; then
+                                       msgfailoutput "run failed with exitcode ${EXITCODE}, but with no errors" "$OUTPUT" "$@"
+                               else
+                                       msgpass
+                               fi

                        fi
                else
                        msgpass
                        fi
                else
                        msgpass