diff options
| author | jvoisin | 2017-09-25 22:43:15 +0200 |
|---|---|---|
| committer | jvoisin | 2017-09-25 23:03:45 +0200 |
| commit | ae15242e59bc77355d76c7407bca8c4665c430c2 (patch) | |
| tree | d012881dabaadfb68efc14e2b83585173e9ad39f | |
| parent | 324b0991d2c4544635483bc9386e2e6c58d86859 (diff) | |
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
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | 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: | |||
| 13 | - cd src | 13 | - cd src |
| 14 | - phpize | 14 | - phpize |
| 15 | - ./configure --enable-snuffleupagus --enable-coverage | 15 | - ./configure --enable-snuffleupagus --enable-coverage |
| 16 | - make | 16 | - make -j 2 |
| 17 | - make test | 17 | - TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test |
| 18 | |||
| 18 | 19 | ||
| 19 | after_success: | 20 | after_success: |
| 20 | - git clone https://github.com/linux-test-project/lcov.git --depth 1 | 21 | - git clone https://github.com/linux-test-project/lcov.git --depth 1 |
| @@ -23,3 +24,7 @@ after_success: | |||
| 23 | - ./lcov/bin/lcov --remove ./COV.info '/usr/*' --remove ./COV.info '*tweetnacl.c' -o ./COV.info --rc lcov_branch_coverage=1 | 24 | - ./lcov/bin/lcov --remove ./COV.info '/usr/*' --remove ./COV.info '*tweetnacl.c' -o ./COV.info --rc lcov_branch_coverage=1 |
| 24 | - ./lcov/bin/genhtml -o ./COV.html ./COV.info --branch-coverage | 25 | - ./lcov/bin/genhtml -o ./COV.html ./COV.info --branch-coverage |
| 25 | - coveralls --exclude 'tweetnacl.c' | 26 | - coveralls --exclude 'tweetnacl.c' |
| 27 | |||
| 28 | after_failure: | ||
| 29 | - grep -r . ./tests/*.out | ||
| 30 | - 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: | |||
| 50 | 50 | ||
| 51 | Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d | 51 | Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d |
| 52 | 52 | ||
| 53 | Notice: Trying to get property of non-object in %a/disable_xxe_dom.php on line %d | 53 | Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d |
| 54 | libxml_disable_entity to true: | 54 | libxml_disable_entity to true: |
| 55 | 55 | ||
| 56 | Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%a/content.txt" in %a/disable_xxe_dom.php on line %d | 56 | 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: | |||
| 59 | 59 | ||
| 60 | Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d | 60 | Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d |
| 61 | 61 | ||
| 62 | Notice: Trying to get property of non-object in %a/disable_xxe_dom.php on line %d | 62 | Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d |
| 63 | libxml_disable_entity to false: | 63 | libxml_disable_entity to false: |
| 64 | without xxe: foo | 64 | without xxe: foo |
| 65 | --CLEAN-- | 65 | --CLEAN-- |
