From 4fcc3df5eb3c878da1a96530c56ccbcd82e2516f Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 8 Oct 2002 17:51:57 +0000 Subject: [PATCH] - Fix .exp output --- run-tests.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run-tests.php b/run-tests.php index 8d914c3fe27..b814c6ec73d 100755 --- a/run-tests.php +++ b/run-tests.php @@ -409,18 +409,18 @@ COMMAND $cmd if (isset($section_text['EXPECTF'])) { $wanted = trim($section_text['EXPECTF']); - $wanted = preg_replace('/\r\n/',"\n",$wanted); - $wanted = preg_quote($wanted, '/'); + $wanted_re = preg_replace('/\r\n/',"\n",$wanted); + $wanted_re = preg_quote($wanted_re, '/'); // Stick to basics - $wanted = str_replace("%s", ".*?", $wanted); //not greedy - $wanted = str_replace("%i", "[0-9]+", $wanted); - $wanted = str_replace("%f", "[0-9\.+\-]+", $wanted); + $wanted_re = str_replace("%s", ".*?", $wanted_re); //not greedy + $wanted_re = str_replace("%i", "[0-9]+", $wanted_re); + $wanted_re = str_replace("%f", "[0-9\.+\-]+", $wanted_re); /* DEBUG YOUR REGEX HERE var_dump($wanted); print(str_repeat('=', 80) . "\n"); var_dump($output); */ - if (preg_match("/$wanted/s", $output)) { + if (preg_match("/$wanted_re/s", $output)) { echo "PASS $tested\n"; return 'PASSED'; }