diff options
| -rwxr-xr-x | test/distrib/php/run_distrib_test.sh | 2 | ||||
| -rwxr-xr-x | test/distrib/php/run_distrib_test_macos.sh | 25 | ||||
| -rw-r--r-- | tools/run_tests/artifacts/distribtest_targets.py | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/test/distrib/php/run_distrib_test.sh b/test/distrib/php/run_distrib_test.sh index ef2de4fec3..a6102f6075 100755 --- a/test/distrib/php/run_distrib_test.sh +++ b/test/distrib/php/run_distrib_test.sh @@ -20,6 +20,6 @@ cd "$(dirname "$0")" cp -r "$EXTERNAL_GIT_ROOT"/input_artifacts/grpc-*.tgz . find . -regex ".*/grpc-[0-9].*.tgz" | cut -b3- | \ - xargs sudo pecl install + xargs pecl install php -d extension=grpc.so -d max_execution_time=300 distribtest.php diff --git a/test/distrib/php/run_distrib_test_macos.sh b/test/distrib/php/run_distrib_test_macos.sh new file mode 100755 index 0000000000..8def049860 --- /dev/null +++ b/test/distrib/php/run_distrib_test_macos.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -ex + +cd "$(dirname "$0")" + +cp -r "$EXTERNAL_GIT_ROOT"/input_artifacts/grpc-*.tgz . + +find . -regex ".*/grpc-[0-9].*.tgz" | cut -b3- | \ + xargs sudo pecl install + +php -d extension=grpc.so -d max_execution_time=300 distribtest.php diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 2f2ab0f06c..041faabcfb 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -232,7 +232,7 @@ class PHPDistribTest(object): copy_rel_path='test/distrib') elif self.platform == 'macos': return create_jobspec( - self.name, ['test/distrib/php/run_distrib_test.sh'], + self.name, ['test/distrib/php/run_distrib_test_macos.sh'], environ={'EXTERNAL_GIT_ROOT': '../../../..'}, use_workspace=True) else: |