reenable gcc warnings for deprecated functions

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index b4220c8b56bb6bc22550a0ee4876596e643a2fc1..f9bb2e8243c701c881bbef7c67cc2468b1309f99 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -388,12 +388,8 @@ EOF
                TEST_DEFAULT_GROUP="$USER"
        fi
 
-        # Acquire::AllowInsecureRepositories=false is not yet the default
-        # but we want it to be the default soon
-        configallowinsecurerepositories "false";
-
        # cleanup the environment a bit
-        # prefer our apt binaries over the system apt binaries
+       # prefer our apt binaries over the system apt binaries
        export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
        export LC_ALL=C.UTF-8
        unset LANGUAGE APT_CONFIG
@@ -506,12 +502,6 @@ int execvp(const char *file, char *const argv[]) {
 EOF
        testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
 }
-
-configallowinsecurerepositories() {
-    echo "Acquire::AllowInsecureRepositories \"$1\";" >  rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
-
-}
-
 configcompression() {
        while [ -n "$1" ]; do
                case "$1" in
@@ -1661,7 +1651,7 @@ testfailuremsg() {
        testfailure "$@"
        msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailuremsg.comparefile"
-       grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+       grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
        testoutputequal "$COMPAREFILE" echo "$CMP"
        msggroup
 }
@@ -1672,7 +1662,7 @@ testwarningmsg() {
        testwarning "$@"
        msgtest 'Check that the output of the previous warned command has expected' 'warnings'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarningmsg.comparefile"
-       grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" > "$COMPAREFILE" 2>&1 || true
+       grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" > "$COMPAREFILE" 2>&1 || true
        testoutputequal "$COMPAREFILE" echo "$CMP"
        msggroup
 }