summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2019-06-19 20:41:16 +1000
committerDamien Zammit <damien@zamaudio.com>2019-06-19 21:50:31 +1000
commitc086bf3a63540e4dfa9732edbe4596836441cad6 (patch)
treec4d2ed2481d652d361916377fb7648aeb8b20e5f
parent45feb260c3f933474f291528f2152e854338647d (diff)
travis: Try adding toolchain 4.9
-rw-r--r--.travis.yml12
-rw-r--r--tests.sh2
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index b20a863..b0dec7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,17 @@ dist: trusty
addons:
apt:
+ sources:
+ - ubuntu-toolchain-r-test
packages:
- - libglib2.0-dev
- - libglib2.0-0
- - pkg-config
+ - gcc-4.9
+ - g++-4.9
+ - libglib2.0-dev
+ - libglib2.0-0
+ - pkg-config
script:
-- make
+- CXX=g++-4.9 make
- ./ptreg
notifications:
diff --git a/tests.sh b/tests.sh
index 1876fd2..b6e25e0 100644
--- a/tests.sh
+++ b/tests.sh
@@ -28,7 +28,7 @@ run_test() {
fi
TMP1=$(mktemp)
TMP2=$(mktemp)
- $PTFTOOL $FILE 2> /dev/null > $TMP1
+ $PTFTOOL $FILE > $TMP1
echo "$EXPECT" > $TMP2
DIFFED=$($DIFF -U0 $TMP2 $TMP1 | $GREP -v -E '^\+\+\+ |^--- ')
rm -f $TMP1 $TMP2