travis: add ppa:ubuntu-toolschain-r/test as source for gcc-5

This makes travis-ci able to run our tests again.
Sometimes.
If it doesn't spontaneously fails with internal gcc errors…

Git-Dch: Ignore

diff --git a/.travis.yml b/.travis.yml
index b449aeba59d2e25fb88bb1affa0a29b00573b8f3..a20018a7975d63bac5d83b49109fa7f56f22cbd3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: cpp
 before_install:
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
  - sudo apt-get update -q
+install:
  - sudo ./prepare-release travis-ci
-script: make && make test && test/integration/run-tests
+ - export CC=gcc-5
+ - export CXX=g++-5
+script: make -j1 && make test && test/integration/run-tests

diff --git a/test/integration/framework b/test/integration/framework
index 2efe7439e423e132b0e7503792cbe60f49dac6fa..b443f2a7b48432d03901fe37f7e1d991f8513b38 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1377,8 +1377,17 @@ testsuccess() {
                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 '^[WE]: ' "$OUTPUT"; then
-                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                       elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
+                               if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
+                                       if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
+                                               | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then
+                                               msgpass
+                                       else
+                                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                                       fi
+                               else
+                                       msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                               fi
                        else
                                msgpass
                        fi

diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch
index f78b83b5ff6d1ca858fbe303db948e810235ff49..a23c03c3f47477f10f604d5dc364d6087f3d6598 100755 (executable)
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -40,7 +40,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 
                testfailure aptget update -o Debug::pkgAcquire::Worker=1
                cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
-               testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" rootdir/tmp/update.output
+               testsuccess grep -E "$(basename "$COMPRESSFILE" '.gz').*Hash Sum mismatch" rootdir/tmp/update.output
                testfailure aptcache show foo
                testfailure aptget install foo -s
 

diff --git a/test/integration/test-apt-update-hashsum-mismatch b/test/integration/test-apt-update-hashsum-mismatch
index c2c5b388797d57c9aea4ee0b778fb128859605e8..4627f7afd04ce8988b8dbb8379f422c0366f68a0 100755 (executable)
--- a/test/integration/test-apt-update-hashsum-mismatch
+++ b/test/integration/test-apt-update-hashsum-mismatch
@@ -35,7 +35,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 
        testfailure aptget update
        cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
-       testsuccess grep -E "$(basename -s '.gz' "$get").*Hash Sum mismatch" rootdir/tmp/update.output
+       testsuccess grep -E "$(basename "$get" '.gz').*Hash Sum mismatch" rootdir/tmp/update.output
        testfailure aptcache show foo
        testfailure aptget install foo -s