From 64d2da72f8d5419e106f32ca5ebfba489bfe1f8b Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Tue, 15 Apr 2008 03:51:21 +0000 Subject: [PATCH] Make flush work with non-standard PHP binaries git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1661 48356398-32a2-884e-a903-53898d9a118a --- maintenance/flush.php | 11 +++++++---- tests/common.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/maintenance/flush.php b/maintenance/flush.php index 7ca0d3db..9f2c2b8d 100644 --- a/maintenance/flush.php +++ b/maintenance/flush.php @@ -18,7 +18,10 @@ function e($cmd) { if ($status) exit($status); } -e($argv[0] . ' generate-includes.php'); -e($argv[0] . ' generate-schema-cache.php'); -e($argv[0] . ' flush-definition-cache.php'); -e($argv[0] . ' generate-standalone.php'); +$php = $_SERVER['argv'][1]; +if (!$php) $php = 'php'; + +e($php . ' generate-includes.php'); +e($php . ' generate-schema-cache.php'); +e($php . ' flush-definition-cache.php'); +e($php . ' generate-standalone.php'); diff --git a/tests/common.php b/tests/common.php index dc786aee..680bd49d 100644 --- a/tests/common.php +++ b/tests/common.php @@ -198,7 +198,7 @@ class FailedTest extends UnitTestCase { * Flushes all caches, and fatally errors out if there's a problem. */ function htmlpurifier_flush($php, $reporter) { - exec($php . ' ../maintenance/flush.php', $out, $status); + exec($php . ' ../maintenance/flush.php ' . $php, $out, $status); if ($status) { $test = new FailedTest( 'maintenance/flush.php returned non-zero exit status',