diff options
| author | valmat <ufabiz@gmail.com> | 2014-03-21 06:23:01 +0600 |
|---|---|---|
| committer | valmat <ufabiz@gmail.com> | 2014-03-21 06:23:01 +0600 |
| commit | ae524a6c76f207636e3b5e3e6ccb83dcefdb14d1 (patch) | |
| tree | d44e443abd990637747fe44c4ad4d5018a7bfc6f /tests/run-tests.php | |
| parent | 6d42a8f99cbe98201a0d52ab276f6929b66cfe4f (diff) | |
Small improvements
Regained the ability to run the tests (script tests/test.sh) with option -m (Valgrind)
added option -q (Quiet)
Full range of options, see $ ./test.sh -h
Some other improvements (see diff)
Diffstat (limited to 'tests/run-tests.php')
| -rw-r--r-- | tests/run-tests.php | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tests/run-tests.php b/tests/run-tests.php index c2616a3..df9cf1e 100644 --- a/tests/run-tests.php +++ b/tests/run-tests.php @@ -1065,6 +1065,14 @@ function error_report($testname, $logname, $tested) function system_with_timeout($commandline, $env = null, $stdin = null) { + /* + * Fixed for tests extension without installation + * extension_for_tests + */ + if(isset($_SERVER["LD_LIBRARY_PATH"])) { + $env['LD_LIBRARY_PATH'] = $_SERVER["LD_LIBRARY_PATH"]; + } + global $leak_check, $cwd; $data = ''; @@ -1792,27 +1800,6 @@ SCRIPT_FILENAME = " . $env['SCRIPT_FILENAME'] . " HTTP_COOKIE = " . $env['HTTP_COOKIE'] . " COMMAND $cmd "; - // - /* - * Fixed for tests extension without installation - * extension_for_tests - */ - /* - $_LD_LIBRARY_PATH = isset($_SERVER["LD_LIBRARY_PATH"]) ? - ('LD_LIBRARY_PATH="' . $_SERVER["LD_LIBRARY_PATH"] . "\"\nexport LD_LIBRARY_PATH") - - : - "###"; - $_LD_LIBRARY_PATH_ex = isset($_SERVER["LD_LIBRARY_PATH"]) ? - ('LD_LIBRARY_PATH="' . $_SERVER["LD_LIBRARY_PATH"] . "\" && export LD_LIBRARY_PATH && ") - - : - ""; - */ - - //$cmd = "LD_LIBRARY_PATH=\"/home/valmat/work/PHP-CPP\" && export LD_LIBRARY_PATH && $cmd"; - //$cmd = "${_LD_LIBRARY_PATH_ex}$cmd"; - junit_start_timer($shortname); |