From: Greg Beaver Date: Sat, 29 Nov 2003 23:37:56 +0000 (+0000) Subject: fix one part - can't get the ereg() to match on windows, will fix when I figure out why X-Git-Tag: php-5.0.0b3RC1~498 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1625d29b57f0b686f7dacb05dddfa319f2c23f;p=php fix one part - can't get the ereg() to match on windows, will fix when I figure out why --- diff --git a/pear/tests/pear_system.phpt b/pear/tests/pear_system.phpt index 854ac20756..5f9dbfdc1f 100644 --- a/pear/tests/pear_system.phpt +++ b/pear/tests/pear_system.phpt @@ -12,6 +12,10 @@ error_reporting(E_ALL); require_once 'System.php'; $sep = DIRECTORY_SEPARATOR; +$ereg_sep = $sep; +if (OS_WINDOWS) { + $ereg_sep .= $sep; +} /******************* mkDir @@ -58,11 +62,12 @@ $tmpfile = System::mkTemp('tst'); $tmpenv = System::tmpDir(); if (!@is_file($tmpfile) || !ereg("^$tmpenv{$sep}tst", $tmpfile)) { print "System::mkTemp('tst') failed\n"; + var_dump(is_file($tmpfile), $tmpfile, "^$tmpenv{$sep}tst", !ereg("^$tmpenv{$ereg_sep}tst", $tmpfile)); } // Create a temporal dir in "dir1" with default prefix "tmp" $tmpdir = System::mkTemp('-d -t dir1'); -if (!@is_dir($tmpdir) || !ereg("^dir1{$sep}tmp", $tmpdir)) { +if (!@is_dir($tmpdir) || !ereg("^dir1{$ereg_sep}tmp", $tmpdir)) { print "System::mkTemp('-d -t dir1') failed\n"; }