diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-09-23 08:04:30 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-09-23 08:04:30 -0700 |
| commit | 7f9fd016f62b6e22bbaab4eaa43eaab1e629e18f (patch) | |
| tree | e7744d3e79c5623e6fa3a81ee02286bb7d2ee379 | |
| parent | 09cc7ddb2fde29b23a498bf2010bf5cd17702518 (diff) | |
| parent | 7a4e8e4498f257e5327fc8fdc7f94145ae4075ef (diff) | |
Merge pull request #3413 from stanley-cheung/php_jenkins_flakes
PHP: jenkins flakes
| -rwxr-xr-x | src/php/bin/run_tests.sh | 6 | ||||
| -rwxr-xr-x | tools/run_tests/build_php.sh | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/php/bin/run_tests.sh b/src/php/bin/run_tests.sh index 953f408ea8..1fe68cdab4 100755 --- a/src/php/bin/run_tests.sh +++ b/src/php/bin/run_tests.sh @@ -31,7 +31,11 @@ # Loads the local shared library, and runs all of the test cases in tests/ # against it set -e -cd $(dirname $0) +cd $(dirname $0)/../../.. +root=$(pwd) +cd src/php/bin source ./determine_extension_dir.sh +# in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib +export DYLD_LIBRARY_PATH=$root/libs/$config php $extension_dir $(which phpunit) -v --debug --strict \ ../tests/unit_tests diff --git a/tools/run_tests/build_php.sh b/tools/run_tests/build_php.sh index 2fad09e1c4..1d81779b6a 100755 --- a/tools/run_tests/build_php.sh +++ b/tools/run_tests/build_php.sh @@ -46,6 +46,3 @@ cd ext/grpc phpize ./configure --enable-grpc=$root make - -# in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib -export DYLD_LIBRARY_PATH=$(pwd)/libs/$config |