summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml7
-rwxr-xr-xscripts/upload_validation.py1
-rw-r--r--src/tests/upload_validation_real.phpt2
3 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ae102d5..2705a4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,15 +30,20 @@ matrix:
30 - env: TARGET="clang php7.1" CC="clang" 30 - env: TARGET="clang php7.1" CC="clang"
31 php: '7.1' 31 php: '7.1'
32 - env: TARGET="clang php7.2" CC="clang" 32 - env: TARGET="clang php7.2" CC="clang"
33 before_install: pip install --user cpp-coveralls
33 php: '7.2' 34 php: '7.2'
34 - env: TARGET="gcc php nightly" CC="gcc" 35 - env: TARGET="gcc php nightly" CC="gcc"
35 before_install: pip install --user cpp-coveralls 36 php: nightly
37 - env: TARGET="clang php nightly" CC="clang"
36 php: nightly 38 php: nightly
37 allow_failures: 39 allow_failures:
40 - env: TARGET="gcc php nightly" CC="gcc"
41 php: nightly
38 - env: TARGET="clang php nightly" CC="clang" # https://bugs.llvm.org/show_bug.cgi?id=9295 42 - env: TARGET="clang php nightly" CC="clang" # https://bugs.llvm.org/show_bug.cgi?id=9295
39 php: nightly 43 php: nightly
40 44
41script: 45script:
46 - pecl install vld-beta
42 - cd src 47 - cd src
43 - phpize 48 - phpize
44 - ./configure --enable-snuffleupagus --enable-coverage 49 - ./configure --enable-snuffleupagus --enable-coverage
diff --git a/scripts/upload_validation.py b/scripts/upload_validation.py
index fb1e05f..1152804 100755
--- a/scripts/upload_validation.py
+++ b/scripts/upload_validation.py
@@ -14,6 +14,7 @@ def check(filename):
14 "-d", "vld.format=1", 14 "-d", "vld.format=1",
15 "-d", "vld.col_sep=@", 15 "-d", "vld.col_sep=@",
16 "-d", "log_errors=0", 16 "-d", "log_errors=0",
17 "-d", "error_log=/dev/null",
17 filename], 18 filename],
18 stderr=subprocess.STDOUT) 19 stderr=subprocess.STDOUT)
19 except subprocess.CalledProcessError as e: 20 except subprocess.CalledProcessError as e:
diff --git a/src/tests/upload_validation_real.phpt b/src/tests/upload_validation_real.phpt
index eef7b04..73f4fed 100644
--- a/src/tests/upload_validation_real.phpt
+++ b/src/tests/upload_validation_real.phpt
@@ -2,7 +2,7 @@
2Upload a file, validation ok, with our real script, using vld 2Upload a file, validation ok, with our real script, using vld
3--SKIPIF-- 3--SKIPIF--
4<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> 4<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
5<?php if (strpos(system("php -d extension=vld.so -m"), "vld") === FALSE) print "skip"; ?> 5<?php if (strpos(system("php -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) print "skip"; ?>
6--INI-- 6--INI--
7file_uploads=1 7file_uploads=1
8sp.configuration_file={PWD}/config/upload_validation_real.ini 8sp.configuration_file={PWD}/config/upload_validation_real.ini