diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-04-01 16:29:41 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-04-01 16:29:41 -0700 |
| commit | bbbb3a001643408d00ff74eb891a54f935ce21d4 (patch) | |
| tree | daf394f2aeba75e170628a22c687c42c319c7b25 /src/php/bin | |
| parent | 9e0ee11756cd79078fec5e4e3a8d25ec59a70ae9 (diff) | |
Updated scripts with PHP 5.6's build location
Diffstat (limited to 'src/php/bin')
| -rwxr-xr-x | src/php/bin/interop_client.sh | 5 | ||||
| -rwxr-xr-x | src/php/bin/run_tests.sh | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/php/bin/interop_client.sh b/src/php/bin/interop_client.sh index 2c61ea8aa0..75cfda9f85 100755 --- a/src/php/bin/interop_client.sh +++ b/src/php/bin/interop_client.sh @@ -31,5 +31,8 @@ set +e cd $(dirname $0) -php -d extension_dir=../ext/grpc/modules/ -d extension=grpc.so \ + +module_dir=`php --version | grep -q 'PHP 5.6' && echo '../ext/grpc' || '../ext/grpc/modules'` + +php -d extension_dir=$module_dir -d extension=grpc.so \ ../tests/interop/interop_client.php $@ 1>&2 diff --git a/src/php/bin/run_tests.sh b/src/php/bin/run_tests.sh index c3358ed899..a8e806b0f3 100755 --- a/src/php/bin/run_tests.sh +++ b/src/php/bin/run_tests.sh @@ -34,13 +34,15 @@ set -e cd $(dirname $0) default_extension_dir=`php -i | grep extension_dir | sed 's/.*=> //g'` +module_dir=`php --version | grep -q 'PHP 5.6' && echo '../ext/grpc' || '../ext/grpc/modules'` + # sym-link in system supplied extensions for f in $default_extension_dir/*.so do - ln -s $f ../ext/grpc/modules/$(basename $f) &> /dev/null || true + ln -s $f $module_dir/$(basename $f) &> /dev/null || true done php \ - -d extension_dir=../ext/grpc/modules/ \ + -d extension_dir=$module_dir \ -d extension=grpc.so \ `which phpunit` -v --debug --strict ../tests/unit_tests |