From ba4a9de042ac669c4e6c98626a35881071f82a0c Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 20 May 2008 14:53:58 +0000 Subject: [PATCH] fix tests (say hello to disk C:\) --- Zend/tests/constants/dir-constant-eval.phpt | 2 +- .../constants/dir-constant-includes.phpt | 20 ++--- .../dir-constant-nested_includes.phpt | 84 +++++++++---------- Zend/tests/constants/dir-constant-normal.phpt | 5 +- 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/Zend/tests/constants/dir-constant-eval.phpt b/Zend/tests/constants/dir-constant-eval.phpt index b225ca2b92..8fe619d563 100755 --- 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 c58077eaf9..8ea65292de 100755 --- 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 da7e758674..18bdfa8912 100755 --- 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 49740db8c0..1a573a2052 100755 --- a/Zend/tests/constants/dir-constant-normal.phpt +++ b/Zend/tests/constants/dir-constant-normal.phpt @@ -4,6 +4,7 @@ Standard behaviour of __DIR__ --EXPECTF-- -%s/tests/constants -%s/tests/constants +%stests%sconstants +%stests%sconstants -- 2.40.0