fix tests (say hello to disk C:\)

diff --git a/Zend/tests/constants/dir-constant-eval.phpt b/Zend/tests/constants/dir-constant-eval.phpt
index b225ca2b92d8d02337fd25a90aaf5d8148ea52f0..8fe619d5636b4ecbd325bc0a5bfc8c5d9e41cec8 100755 (executable)
--- a/Zend/tests/constants/dir-constant-eval.phpt
+++ b/Zend/tests/constants/dir-constant-eval.phpt
@@ -5,4 +5,4 @@ __DIR__ constant used with eval()
 eval('echo __DIR__ . "\n";');
 ?>
 --EXPECTF--
-%s/tests/constants
+%stests%sconstants

diff --git a/Zend/tests/constants/dir-constant-includes.phpt b/Zend/tests/constants/dir-constant-includes.phpt
index c58077eaf96b2db7151d273a299bf4167d5739ce..8ea65292de6e23db2ffc82866c7a6e341b046364 100755 (executable)
--- a/Zend/tests/constants/dir-constant-includes.phpt
+++ b/Zend/tests/constants/dir-constant-includes.phpt
@@ -10,13 +10,13 @@ include 'fixtures/folder3/fixture.php';
 include 'fixtures/folder4/fixture.php';
 ?>
 --EXPECTF--
-%s/tests/constants
-%s/tests/constants
-%s/tests/constants/fixtures/folder1
-%s/tests/constants/fixtures/folder1
-%s/tests/constants/fixtures/folder2
-%s/tests/constants/fixtures/folder2
-%s/tests/constants/fixtures/folder3
-%s/tests/constants/fixtures/folder3
-%s/tests/constants/fixtures/folder4
-%s/tests/constants/fixtures/folder4
+%stests%sconstants
+%stests%sconstants
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4

diff --git a/Zend/tests/constants/dir-constant-nested_includes.phpt b/Zend/tests/constants/dir-constant-nested_includes.phpt
index da7e758674d9da6d5f4f30ff4149dfc548720e64..18bdfa89123ac0b078c91fed1eec6d559a2de59d 100755 (executable)
--- a/Zend/tests/constants/dir-constant-nested_includes.phpt
+++ b/Zend/tests/constants/dir-constant-nested_includes.phpt
@@ -26,45 +26,45 @@ include 'fixtures/folder4/subfolder3/fixture.php';
 include 'fixtures/folder4/subfolder4/fixture.php';
 ?>
 --EXPECTF--
-%s/tests/constants
-%s/tests/constants
-%s/tests/constants/fixtures/folder1
-%s/tests/constants/fixtures/folder1
-%s/tests/constants/fixtures/folder1/subfolder1
-%s/tests/constants/fixtures/folder1/subfolder1
-%s/tests/constants/fixtures/folder1/subfolder2
-%s/tests/constants/fixtures/folder1/subfolder2
-%s/tests/constants/fixtures/folder1/subfolder3
-%s/tests/constants/fixtures/folder1/subfolder3
-%s/tests/constants/fixtures/folder1/subfolder4
-%s/tests/constants/fixtures/folder1/subfolder4
-%s/tests/constants/fixtures/folder2
-%s/tests/constants/fixtures/folder2
-%s/tests/constants/fixtures/folder2/subfolder1
-%s/tests/constants/fixtures/folder2/subfolder1
-%s/tests/constants/fixtures/folder2/subfolder2
-%s/tests/constants/fixtures/folder2/subfolder2
-%s/tests/constants/fixtures/folder2/subfolder3
-%s/tests/constants/fixtures/folder2/subfolder3
-%s/tests/constants/fixtures/folder2/subfolder4
-%s/tests/constants/fixtures/folder2/subfolder4
-%s/tests/constants/fixtures/folder3
-%s/tests/constants/fixtures/folder3
-%s/tests/constants/fixtures/folder3/subfolder1
-%s/tests/constants/fixtures/folder3/subfolder1
-%s/tests/constants/fixtures/folder3/subfolder2
-%s/tests/constants/fixtures/folder3/subfolder2
-%s/tests/constants/fixtures/folder3/subfolder3
-%s/tests/constants/fixtures/folder3/subfolder3
-%s/tests/constants/fixtures/folder3/subfolder4
-%s/tests/constants/fixtures/folder3/subfolder4
-%s/tests/constants/fixtures/folder4
-%s/tests/constants/fixtures/folder4
-%s/tests/constants/fixtures/folder4/subfolder1
-%s/tests/constants/fixtures/folder4/subfolder1
-%s/tests/constants/fixtures/folder4/subfolder2
-%s/tests/constants/fixtures/folder4/subfolder2
-%s/tests/constants/fixtures/folder4/subfolder3
-%s/tests/constants/fixtures/folder4/subfolder3
-%s/tests/constants/fixtures/folder4/subfolder4
-%s/tests/constants/fixtures/folder4/subfolder4
+%stests%sconstants
+%stests%sconstants
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder1
+%stests%sconstants%sfixtures%sfolder1%ssubfolder2
+%stests%sconstants%sfixtures%sfolder1%ssubfolder2
+%stests%sconstants%sfixtures%sfolder1%ssubfolder3
+%stests%sconstants%sfixtures%sfolder1%ssubfolder3
+%stests%sconstants%sfixtures%sfolder1%ssubfolder4
+%stests%sconstants%sfixtures%sfolder1%ssubfolder4
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder1
+%stests%sconstants%sfixtures%sfolder2%ssubfolder1
+%stests%sconstants%sfixtures%sfolder2%ssubfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder2
+%stests%sconstants%sfixtures%sfolder2%ssubfolder3
+%stests%sconstants%sfixtures%sfolder2%ssubfolder3
+%stests%sconstants%sfixtures%sfolder2%ssubfolder4
+%stests%sconstants%sfixtures%sfolder2%ssubfolder4
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder1
+%stests%sconstants%sfixtures%sfolder3%ssubfolder1
+%stests%sconstants%sfixtures%sfolder3%ssubfolder2
+%stests%sconstants%sfixtures%sfolder3%ssubfolder2
+%stests%sconstants%sfixtures%sfolder3%ssubfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder3
+%stests%sconstants%sfixtures%sfolder3%ssubfolder4
+%stests%sconstants%sfixtures%sfolder3%ssubfolder4
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4
+%stests%sconstants%sfixtures%sfolder4%ssubfolder1
+%stests%sconstants%sfixtures%sfolder4%ssubfolder1
+%stests%sconstants%sfixtures%sfolder4%ssubfolder2
+%stests%sconstants%sfixtures%sfolder4%ssubfolder2
+%stests%sconstants%sfixtures%sfolder4%ssubfolder3
+%stests%sconstants%sfixtures%sfolder4%ssubfolder3
+%stests%sconstants%sfixtures%sfolder4%ssubfolder4
+%stests%sconstants%sfixtures%sfolder4%ssubfolder4

diff --git a/Zend/tests/constants/dir-constant-normal.phpt b/Zend/tests/constants/dir-constant-normal.phpt
index 49740db8c0c92ca56bfc275aa25916e45a8496f3..1a573a2052ce3607e52dbe2f23e1c788e85868cc 100755 (executable)
--- a/Zend/tests/constants/dir-constant-normal.phpt
+++ b/Zend/tests/constants/dir-constant-normal.phpt
@@ -4,6 +4,7 @@ Standard behaviour of __DIR__
 <?php
 echo __DIR__ . "\n";
 echo dirname(__FILE__) . "\n";
+?>
 --EXPECTF--
-%s/tests/constants
-%s/tests/constants
+%stests%sconstants
+%stests%sconstants