From 884bbbdf5f0916a840bb9fc8f40c14163d58fad8 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 22 Feb 2018 16:35:39 +0100
Subject: php-nightly is now allowed to fail

PHP is breaking too many things on nightly, we'll only support releases from now on.

This should also make our vld-based file-upload checker more resilient: no more random warnings on stderr.---
 .travis.yml                           | 7 ++++++-
 scripts/upload_validation.py          | 1 +
 src/tests/upload_validation_real.phpt | 2 +-
 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:
   - env: TARGET="clang php7.1" CC="clang"
     php: '7.1'
   - env: TARGET="clang php7.2" CC="clang"
+    before_install: pip install --user cpp-coveralls
     php: '7.2'
   - env: TARGET="gcc php nightly" CC="gcc"
-    before_install: pip install --user cpp-coveralls
+    php: nightly
+  - env: TARGET="clang php nightly" CC="clang"
     php: nightly
   allow_failures:
+  - env: TARGET="gcc php nightly" CC="gcc"
+    php: nightly
   - env: TARGET="clang php nightly" CC="clang"  # https://bugs.llvm.org/show_bug.cgi?id=9295
     php: nightly
 
 script:
+  - pecl install vld-beta
   - cd src
   - phpize
   - ./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):
             "-d", "vld.format=1",
             "-d", "vld.col_sep=@",
             "-d", "log_errors=0",
+            "-d", "error_log=/dev/null",
             filename],
             stderr=subprocess.STDOUT)
     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 @@
 Upload a file, validation ok, with our real script, using vld
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (strpos(system("php -d extension=vld.so -m"), "vld") === FALSE) print "skip"; ?>
+<?php if (strpos(system("php -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) print "skip"; ?>
 --INI--
 file_uploads=1
 sp.configuration_file={PWD}/config/upload_validation_real.ini
-- 
cgit v1.3