From 0aa3acc6c420ef19a33ee80e65c4fb2f2ee128d0 Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Sat, 28 Sep 2019 21:29:54 +0200
Subject: Fix borked SKIPIFs

---
 sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt |  2 +-
 sapi/cli/tests/upload_2G.phpt                     | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'sapi/cli')

diff --git a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
index 1505281dd3..9028b6902b 100644
--- a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
+++ b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
@@ -3,7 +3,7 @@ sapi_windows_set_ctrl_handler()
 --SKIPIF--
 <?php
 
-include "skipinf.inc";
+include "skipif.inc";
 
 if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
   die("skip this test is for Windows platforms only");
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index 44d2da4a81..82bbbca481 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -8,10 +8,16 @@ if (PHP_INT_SIZE < 8) {
 	die("skip need PHP_INT_SIZE>=8");
 }
 
+if (!file_exists('/proc/meminfo')) {
+	die('skip Cannot check free RAM from /proc/meminfo on this platform');
+}
+
+$free_ram = 0;
 if ($f = fopen("/proc/meminfo","r")) {
 	while (!feof($f)) {
-		if (!strncmp($line = fgets($f), "MemFree", 7)) {
-			if (substr($line,8)/1024/1024 > 3) {
+		if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) {
+			$free_ram = max($free_ram, $m[1]/1024/1024);
+			if ($free_ram > 3) {
 				$enough_free_ram = true;
 			}
 		}
@@ -19,7 +25,7 @@ if ($f = fopen("/proc/meminfo","r")) {
 }
 
 if (empty($enough_free_ram)) {
-	die("skip need +3G free RAM");
+	die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram));
 }
 
 if (getenv('TRAVIS')) {
-- 
cgit v1.2.1