Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improve flexibility of test script.

git-svn-id: http://svn.php.net/repository/pear/packages/DB/trunk@315556 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit 97461e81d4ff06877c868895074dede92406120b 1 parent 050ce46
Daniel Convissor authored
Showing with 12 additions and 18 deletions.
  1. +6 −9 tests/driver/run.cvs
  2. +6 −9 tests/run.cvs
View
15 tests/driver/run.cvs
@@ -1,7 +1,5 @@
#! /bin/sh
-# $Id$
-
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
# PEAR DB TEST STARTER
#
@@ -12,12 +10,12 @@
# Before running the tests you must adjust the
# following three variables:
-# The full path to your PHP directory:
- DB_TEST_PHP_PATH=c:/progra~1/php
+# The path and name of your run-tests.php file:
+ DB_TEST_RUN_TESTS=c:/progra~1/php/run-tests.php
-# The name of your PHP CLI executable
-# (examples php.exe, php-cli.exe, cli/php.exe):
- DB_TEST_PHP_CLI=php.exe
+# The path and name of your PHP CLI executable
+# (example c:/progra~1/php.exe):
+ TEST_PHP_EXECUTABLE=c:/progra~1/php.exe
# The full path to the present directory
# (not using $PWD due to Cygwin):
@@ -27,7 +25,6 @@
-TEST_PHP_EXECUTABLE=$DB_TEST_PHP_PATH/$DB_TEST_PHP_CLI
export TEST_PHP_EXECUTABLE
if [ $# -gt 0 ]
@@ -37,4 +34,4 @@ else
test=*.phpt
fi
-$TEST_PHP_EXECUTABLE $DB_TEST_PHP_PATH/run-tests.php $DB_TEST_DIR/${test}
+$TEST_PHP_EXECUTABLE $DB_TEST_RUN_TESTS $DB_TEST_DIR/${test}
View
15 tests/run.cvs
@@ -1,7 +1,5 @@
#! /bin/sh
-# $Id$
-
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
# PEAR DB TEST STARTER
#
@@ -12,12 +10,12 @@
# Before running the tests you must adjust the
# following three variables:
-# The full path to your PHP directory:
- DB_TEST_PHP_PATH=c:/progra~1/php
+# The path and name of your run-tests.php file:
+ DB_TEST_RUN_TESTS=c:/progra~1/php/run-tests.php
-# The name of your PHP CLI executable
-# (examples php.exe, php-cli.exe, cli/php.exe):
- DB_TEST_PHP_CLI=php.exe
+# The path and name of your PHP CLI executable
+# (example c:/progra~1/php.exe):
+ TEST_PHP_EXECUTABLE=c:/progra~1/php.exe
# The full path to the present directory
# (not using $PWD due to Cygwin):
@@ -27,7 +25,6 @@
-TEST_PHP_EXECUTABLE=$DB_TEST_PHP_PATH/$DB_TEST_PHP_CLI
export TEST_PHP_EXECUTABLE
if [ $# -gt 0 ]
@@ -37,4 +34,4 @@ else
test=*.phpt
fi
-$TEST_PHP_EXECUTABLE $DB_TEST_PHP_PATH/run-tests.php $DB_TEST_DIR/${test}
+$TEST_PHP_EXECUTABLE $DB_TEST_RUN_TESTS $DB_TEST_DIR/${test}

0 comments on commit 97461e8

Please sign in to comment.
Something went wrong with that request. Please try again.