From ae15242e59bc77355d76c7407bca8c4665c430c2 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Mon, 25 Sep 2017 22:43:15 +0200
Subject: Improve the travis file

- if something is failing, display the guilty outputs.
- Don't spam php's tracker
- Failing tests are now triggering an `exit 1`
- Fix a test to make it work on every php version (php changed the error
  message)
- `make -j2` on travis
---
 .travis.yml                    | 9 +++++++--
 src/tests/disable_xxe_dom.phpt | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed2480f..cdc6d7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,9 @@ script:
   - cd src
   - phpize
   - ./configure --enable-snuffleupagus --enable-coverage
-  - make
-  - make test
+  - make -j 2
+  - TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test
+
 
 after_success:
   - git clone https://github.com/linux-test-project/lcov.git --depth 1
@@ -23,3 +24,7 @@ after_success:
   - ./lcov/bin/lcov --remove ./COV.info '/usr/*' --remove ./COV.info '*tweetnacl.c' -o ./COV.info --rc lcov_branch_coverage=1
   - ./lcov/bin/genhtml -o ./COV.html ./COV.info  --branch-coverage
   - coveralls --exclude 'tweetnacl.c'
+
+after_failure:
+  - grep -r . ./tests/*.out
+  - grep -r . ./tests/*.diff
\ No newline at end of file
diff --git a/src/tests/disable_xxe_dom.phpt b/src/tests/disable_xxe_dom.phpt
index 864b2a1..8b63589 100644
--- a/src/tests/disable_xxe_dom.phpt
+++ b/src/tests/disable_xxe_dom.phpt
@@ -50,7 +50,7 @@ Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line:
 
 Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d
 
-Notice: Trying to get property of non-object in %a/disable_xxe_dom.php on line %d
+Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d
 libxml_disable_entity to true: 
 
 Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%a/content.txt" in %a/disable_xxe_dom.php on line %d
@@ -59,7 +59,7 @@ Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line:
 
 Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d
 
-Notice: Trying to get property of non-object in %a/disable_xxe_dom.php on line %d
+Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d
 libxml_disable_entity to false: 
 without xxe: foo
 --CLEAN--
-- 
cgit v1.3