From 926dbb67ad29fe452987242bc6fc466d3c28fced Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Wed, 16 May 2018 11:32:17 +0200
Subject: Improve the testsuite's robustness against php7.2

---
 src/tests/upload_validation_real.phpt | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tests/upload_validation_real.phpt b/src/tests/upload_validation_real.phpt
index 73f4fed..5b6b839 100644
--- a/src/tests/upload_validation_real.phpt
+++ b/src/tests/upload_validation_real.phpt
@@ -1,8 +1,19 @@
 --TEST--
 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 error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) print "skip"; ?>
+<?php
+if (!extension_loaded("snuffleupagus")) {
+ 	print "skip";
+}
+
+if (strpos(system("php -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) {
+	print "skip";
+}
+
+if (strpos(system("php -d extension=vld.so -m 2>&1 | grep 'Unable to load'"), "Unable to load dynamic library 'vld.so'") !== FALSE) {
+	print "skip";
+}
+?>
 --INI--
 file_uploads=1
 sp.configuration_file={PWD}/config/upload_validation_real.ini
-- 
cgit v1.3