summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxXx-caillou-xXx2018-07-13 17:08:20 +0200
committerjvoisin2018-07-13 15:08:20 +0000
commit1d8294750268d6d89b690312bc153c359abe6f6c (patch)
treecb8fc48c8e215db9d10b4b36aaecb7dc3a33a676
parent050eefd845ed9a588a8c92ed10827b0669883145 (diff)
Skip VLD for php7.3, as VLD is not compatible yet.
-rw-r--r--.travis.yml4
-rw-r--r--src/tests/upload_validation_real.phpt4
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 876b712..5f3f486 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,9 @@ matrix:
43 php: nightly 43 php: nightly
44 44
45script: 45script:
46 - pecl install vld-beta 46 - 'if [[ ! "${TARGET}" = *"nightly"* ]]; then
47 pecl install vld-beta ;
48 fi'
47 - cd src 49 - cd src
48 - phpize 50 - phpize
49 - ./configure --enable-snuffleupagus --enable-coverage 51 - ./configure --enable-snuffleupagus --enable-coverage
diff --git a/src/tests/upload_validation_real.phpt b/src/tests/upload_validation_real.phpt
index b7af562..f1d29d4 100644
--- a/src/tests/upload_validation_real.phpt
+++ b/src/tests/upload_validation_real.phpt
@@ -6,6 +6,10 @@ if (!extension_loaded("snuffleupagus")) {
6 print "skip"; 6 print "skip";
7} 7}
8 8
9if (PHP_VERSION_ID >= 70300) {
10 die("skip BROKEN with 7.3");
11}
12
9if (strpos(system("php -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) { 13if (strpos(system("php -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) {
10 print "skip"; 14 print "skip";
11} 15}