From f98cf2d2e2f3492bae47f0b7f42f29b28c5f060f Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 13 May 2015 17:25:26 -0700 Subject: [PATCH] fix php5.6 ext location --- src/php/bin/interop_client.sh | 2 +- src/php/bin/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/php/bin/interop_client.sh b/src/php/bin/interop_client.sh index 22e4a493c4c..4fe63788c15 100755 --- a/src/php/bin/interop_client.sh +++ b/src/php/bin/interop_client.sh @@ -32,7 +32,7 @@ set +e cd $(dirname $0) -module_dir=`php --version | grep -q 'PHP 5.6' && echo '../ext/grpc' || echo '../ext/grpc/modules'` +module_dir=../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 1335672e9e1..551be125144 100755 --- a/src/php/bin/run_tests.sh +++ b/src/php/bin/run_tests.sh @@ -34,7 +34,7 @@ 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' || echo '../ext/grpc/modules'` +module_dir=../ext/grpc/modules # sym-link in system supplied extensions for f in $default_extension_dir/*.so