Fix GC tests on dbg-zts-nocache

We may collect a different number of zvals depending on interning.
Switch tests to compare against a minimum number of collections
instead of a fixed value.

diff --git a/Zend/tests/gc_013.phpt b/Zend/tests/gc_013.phpt
index 9209ca2b402188aaec05698ef311d2983ee51c80..0c5424086a16128eb21ed79d44fdbade5e004cf9 100644 (file)
--- a/Zend/tests/gc_013.phpt
+++ b/Zend/tests/gc_013.phpt
@@ -10,9 +10,9 @@ for ($i = 0; $i < 10001; $i++) {
 }
 $a[] = "xxx";
 unset($a);
-var_dump(gc_collect_cycles());
+var_dump(gc_collect_cycles() > 0);
 echo "ok\n";
 ?>
 --EXPECT--
-int(2)
+bool(true)
 ok

diff --git a/Zend/tests/gc_014.phpt b/Zend/tests/gc_014.phpt
index cd5a15e6819eec82e573999daef2124b777d1ddf..4fd8948af59be8a75173cb2fb6a483001bc254c5 100644 (file)
--- a/Zend/tests/gc_014.phpt
+++ b/Zend/tests/gc_014.phpt
@@ -12,9 +12,9 @@ for ($i = 0; $i < 10001; $i++) {
 unset($b);
 $a->b = "xxx";
 unset($a);
-var_dump(gc_collect_cycles());
+var_dump(gc_collect_cycles() > 0);
 echo "ok\n";
 ?>
 --EXPECT--
-int(2)
+bool(true)
 ok

diff --git a/Zend/tests/gc_015.phpt b/Zend/tests/gc_015.phpt
index df85836ed89d70d5ae7751c89d2b2560e941a5a8..24acddeae128edf7a390146c619ac87410a22363 100644 (file)
--- a/Zend/tests/gc_015.phpt
+++ b/Zend/tests/gc_015.phpt
@@ -12,9 +12,9 @@ $a->b = "xxx";
 unset($c);
 unset($a);
 unset($b);
-var_dump(gc_collect_cycles());
+var_dump(gc_collect_cycles() > 0);
 echo "ok\n";
 ?>
 --EXPECT--
-int(2)
+bool(true)
 ok

diff --git a/Zend/tests/gc_017.phpt b/Zend/tests/gc_017.phpt
index 28d51980c9d7ed9e127ef2353427d9924daa19d6..a1a8c3eaf6246a6f6dbc41cb157a50d281a1cb00 100644 (file)
--- a/Zend/tests/gc_017.phpt
+++ b/Zend/tests/gc_017.phpt
@@ -31,12 +31,12 @@ $a->insert($c);
 unset($a);
 unset($b);
 unset($c);
-var_dump(gc_collect_cycles());
+var_dump(gc_collect_cycles() >= 7);
 echo "ok\n"
 ?>
 --EXPECTF--
 string(1) "%s"
 string(1) "%s"
 string(1) "%s"
-int(10)
+bool(true)
 ok