Tests clean-up (probably only part 1 though...)

derickr · Sep 14, 2011 · 903e2fb · 903e2fb
1 parent f1ea6ab
commit 903e2fb
Show file tree

Hide file tree

Showing 138 changed files with 138 additions and 356 deletions.
diff --git a/tests/001.phpt b/tests/001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Check for xdebug presence
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.profiler_enable=0
 --FILE--

diff --git a/tests/array_map.phpt b/tests/array_map.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with internal callbacks
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/assert_test.phpt b/tests/assert_test.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for assertion callbacks
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/assignment-trace8-php52.phpt b/tests/assignment-trace8-php52.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing multi-dimensional property assignments in user-readable function traces (< PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '<')) echo "skip < PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

diff --git a/tests/assignment-trace8.phpt b/tests/assignment-trace8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing multi-dimensional property assignments in user-readable function traces (>= PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

diff --git a/tests/assignment-trace9-php52.phpt b/tests/assignment-trace9-php52.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing mixed array element and property assignments in user-readable function traces (< PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '<')) echo "skip < PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

diff --git a/tests/assignment-trace9.phpt b/tests/assignment-trace9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing mixed array element and property assignments in user-readable function traces (>= PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

diff --git a/tests/auto_trace.phpt b/tests/auto_trace.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with auto-trace
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1

diff --git a/tests/bug00001.phpt b/tests/bug00001.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for crash with a destructor
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00002.phpt b/tests/bug00002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for traces to file
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00003.phpt b/tests/bug00003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Text for crash bug in tracing to file
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00022.phpt b/tests/bug00022.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for segmentation fault with xdebug_get_function_stack() and collect_params=1. (ZE20)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2.0 needed\n"; ?>
+Test for segmentation fault with xdebug_get_function_stack() and collect_params=1
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00032-php52.phpt b/tests/bug00032-php52.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test for segmentation fault with unusual variables (>= PHP 5.2)
+--SKIPIF--
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
+--INI--
+xdebug.default_enable=1
+xdebug.auto_trace=0
+xdebug.collect_params=1
+xdebug.collect_assignments=0
+xdebug.profiler_enable=0
+xdebug.show_local_vars=0
+xdebug.dump_globals=0
+--FILE--
+<?php
+	${1} = "foo";
+	echo ${1} . "\n";
+
+	${STDIN} = "foo";
+	echo ${STDIN} . "\n";
+
+	${array(1,2,3)} = "foo";
+	echo ${array(1,2,3)} . "\n";
+
+	${new stdclass} = "foo";
+	echo ${new stdclass} . "\n";
+?>
+--EXPECTF--
+foo
+foo
+
+Notice: Array to string conversion in %sbug00032-php52.php on line 8
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
+
+
+Notice: Array to string conversion in %sbug00032-php52.php on line 9
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
+
+foo
+
+Catchable fatal error: Object of class stdClass could not be converted to string in %sbug00032-php52.php on line 11
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
diff --git a/tests/bug00032-ze22.phpt b/tests/bug00032-ze22.phpt
diff --git a/tests/bug00032.phpt b/tests/bug00032.phpt
@@ -1,9 +1,7 @@
 --TEST--
-Test for segmentation fault with unusual variables (ZE2)
+Test for segmentation fault with unusual variables (< PHP 5.2)
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2.0/2.1 needed\n"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '>')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '<')) echo "skip < PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
@@ -34,19 +32,23 @@ Notice: Array to string conversion in %sbug00032.php on line 8
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
 
+
 Notice: Array to string conversion in %sbug00032.php on line 9
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
+
 foo
 
 Notice: Object of class stdClass to string conversion in %sbug00032.php on line 11
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
 
+
 Notice: Object of class stdClass to string conversion in %sbug00032.php on line 12
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
+
 foo
diff --git a/tests/bug00057-ze2.phpt → tests/bug00057.phpt b/tests/bug00057-ze2.phpt → tests/bug00057.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #57: Crash with overloading functions (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #57: Crash with overloading functions
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00089.phpt b/tests/bug00089.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #89: var_dump shows empty strings garbled
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00146.phpt b/tests/bug00146.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #146: Array key names with quotes in traces are not escaped
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00168.phpt b/tests/bug00168.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #168: Memory error with DBGp eval when the result is an array.
+Test for bug #168: Memory error with DBGp eval when the result is an array
 --SKIPIF--
 <?php print "skip Can only be tested through DBGp"; ?>
 --FILE--

diff --git a/tests/bug00173.phpt b/tests/bug00173.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test for bug #173: Xdebug segfaults using SPL ArrayIterator.
+Test for bug #173: Xdebug segfaults using SPL ArrayIterator (>= PHP 5.2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
 <?php if (!extension_loaded("SPL")) print "skip No SPL available"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1

diff --git a/tests/bug00176.phpt b/tests/bug00176.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test for bug #176: Segfault using SplTempFileObject
+Test for bug #176: Segfault using SplTempFileObject (>= PHP 5.2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
 <?php if (!extension_loaded("SPL")) print "skip No SPL available"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00209.phpt b/tests/bug00209.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #209: Additional remote debugging session started when triggering shutdown function.
+Test for bug #209: Additional remote debugging session started when triggering shutdown function
 --SKIPIF--
 <?php print "skip Can only be tested through DBGp"; ?>
 --FILE--

diff --git a/tests/bug00212a.phpt b/tests/bug00212a.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate (ZE2).
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (1)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00212b.phpt b/tests/bug00212b.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (2)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00212c.phpt b/tests/bug00212c.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (3)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00213.phpt b/tests/bug00213.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #213: Dead code analysis doesn't take catches for throws into account.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #213: Dead code analysis doesn't take catches for throws into account
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00241.phpt b/tests/bug00241.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #241: Crash in xdebug_get_function_stack().
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #241: Crash in xdebug_get_function_stack()
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

diff --git a/tests/bug00265.phpt b/tests/bug00265.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #265: Xdebug's error handler breaks error_get_last().
---SKIPIF--
-<?php if(version_compare(phpversion(), "5.2.0", '<')) echo "skip PHP 5.2 or higher needed\n"; ?>
+Test for bug #265: Xdebug's error handler breaks error_get_last()
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0

diff --git a/tests/bug00280.phpt b/tests/bug00280.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for bug #280: var_dump don't display key of array as expected
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.overload_var_dump=1
 --FILE--

diff --git a/tests/bug00298.phpt b/tests/bug00298.phpt
@@ -1,9 +1,5 @@
 --TEST--
-Test for bug #298: xdebug_var_dump & multiline strings,
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
---INI--
+Test for bug #298: xdebug_var_dump & multiline strings
 --FILE--
 <?php
 ini_set('html_errors', '1');

diff --git a/tests/bug00313.phpt b/tests/bug00313.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #313: Segmentation Fault in code coverage analysis on empty PHP files.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #313: Segmentation Fault in code coverage analysis on empty PHP files
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0

diff --git a/tests/bug00314.phpt b/tests/bug00314.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #314: PHP CLI Error Logging thwarted when XDebug Loaded.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #314: PHP CLI Error logging thwarted when Xdebug loaded
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0