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.---
 src/tests/upload_validation_real.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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