Allow some tests to run in parallel, and mark others as unable to run…

… in parallel
xdebug · Feb 8, 2019 · 1abb15bf450db0ad7c4e1624b65b9503332ede04 · 1abb15b
1 parent 28660ac
commit 1abb15bf450db0ad7c4e1624b65b9503332ede04
Unified Split

Showing with 15 additions and 8 deletions.

+1 −1 tests/bug00003.phpt

+4 −3 tests/bug00314.phpt

+2 −0 tests/bug00690-1.phpt

+2 −0 tests/bug00690-2.phpt

+1 −0 tests/bug00964-1.phpt

+1 −0 tests/bug00964-2.phpt

+4 −4 tests/trace_with_naked_filename.phpt
diff --git a/tests/bug00003.phpt b/tests/bug00003.phpt
@@ -13,7 +13,7 @@ xdebug.trace_format=0
 date.timezone=Europe/Oslo
 --FILE--
 <?php
-  
-	$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug00003.trace');
+  
+	$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug00003-' . uniqid() . '.trace');
 	strftime('%b %l %Y %H:%M:%S', 1061728888);
 	xdebug_stop_trace();
 	readfile($tf);

diff --git a/tests/bug00314.phpt b/tests/bug00314.phpt
@@ -2,22 +2,23 @@
 Test for bug #314: PHP CLI Error logging thwarted when Xdebug loaded
 --SKIPIF--
 <?php if (substr(PHP_OS, 0, 3) == "WIN") { exit("skip Not for Windows"); } ?>
+  
+<?php if (getenv("SKIP_UNPARALLEL_TESTS")) { exit("skip Excluding tests that can not be run in parallel"); } ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
 xdebug.show_mem_delta=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0
 log_errors=1
-  
-error_log=/tmp/bug315.log
+  
+error_log=/tmp/bug314.log
 xdebug.collect_params=3
 date.timezone=UTC
 --FILE--
 <?php
-  
-@unlink("/tmp/bug315.log");
+  
+@unlink("/tmp/bug314.log");
 trigger_error('Error', E_USER_WARNING);
 echo "FROM LOG\n";
-  
-echo file_get_contents("/tmp/bug315.log");
+  
+echo file_get_contents("/tmp/bug314.log");
 ?>
 --EXPECTF--
 Warning: Error in %sbug00314.php on line 3

diff --git a/tests/bug00690-1.phpt b/tests/bug00690-1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test for bug #690: Function traces are not appended to file when xdebug_start_trace() is used with xdebug.trace_options=1 (step 1 of 2)
+  
+--SKIPIF--
+  
+<?php if (getenv("SKIP_UNPARALLEL_TESTS")) { exit("skip Excluding tests that can not be run in parallel"); } ?>
 --INI--
 xdebug.trace_output_name=trace.bug690
 xdebug.trace_options=1

diff --git a/tests/bug00690-2.phpt b/tests/bug00690-2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test for bug #690: Function traces are not appended to file when xdebug_start_trace() is used with xdebug.trace_options=1 (step 2 of 2)
+  
+--SKIPIF--
+  
+<?php if (getenv("SKIP_UNPARALLEL_TESTS")) { exit("skip Excluding tests that can not be run in parallel"); } ?>
 --INI--
 xdebug.auto_trace=0
 xdebug.trace_output_name=trace.bug690

diff --git a/tests/bug00964-1.phpt b/tests/bug00964-1.phpt
@@ -2,6 +2,7 @@
 Test for bug #964: IP retrival from X-Forwarded-For complies with RFC 7239 (without comma)
 --SKIPIF--
 <?php if (substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?>
+  
+<?php if (getenv("SKIP_UNPARALLEL_TESTS")) { exit("skip Excluding tests that can not be run in parallel"); } ?>
 --ENV--
 HTTP_X_FORWARDED_FOR=192.168.111.111
 --INI--

diff --git a/tests/bug00964-2.phpt b/tests/bug00964-2.phpt
@@ -2,6 +2,7 @@
 Test for bug #964: IP retrival from X-Forwarded-For complies with RFC 7239 (with comma)
 --SKIPIF--
 <?php if (substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?>
+  
+<?php if (getenv("SKIP_UNPARALLEL_TESTS")) { exit("skip Excluding tests that can not be run in parallel"); } ?>
 --ENV--
 HTTP_X_FORWARDED_FOR=192.168.111.111, 10.1.2.3, 10.1.2.4
 --INI--

diff --git a/tests/trace_with_naked_filename.phpt b/tests/trace_with_naked_filename.phpt
@@ -12,16 +12,16 @@ xdebug.show_mem_delta=0
 xdebug.trace_format=0
 --FILE--
 <?php
-  
-$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug971', XDEBUG_TRACE_COMPUTERIZED);
+  
+$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug971' . uniqid(), XDEBUG_TRACE_COMPUTERIZED);
 echo $tf, "\n";
 xdebug_stop_trace();
 unlink($tf);
-  
-$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug971', XDEBUG_TRACE_COMPUTERIZED | XDEBUG_TRACE_NAKED_FILENAME);
+  
+$tf = xdebug_start_trace(sys_get_temp_dir() . '/bug971' . uniqid(), XDEBUG_TRACE_COMPUTERIZED | XDEBUG_TRACE_NAKED_FILENAME);
 echo $tf, "\n";
 xdebug_stop_trace();
 unlink($tf);
 ?>
 --EXPECTF--
-  
-%sbug971.xt
-  
-%sbug971
+  
+%sbug971%s.xt
+  
+%sbug971%s