This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new e53d23c THRIFT-4794: finish php json cross test
e53d23c is described below
commit e53d23c16c806c6da62ebaa7f205328cf710d9a5
Author: James E. King III <[email protected]>
AuthorDate: Sun Feb 10 11:13:23 2019 -0500
THRIFT-4794: finish php json cross test
---
build/docker/ubuntu-bionic/Dockerfile | 1 +
build/docker/ubuntu-xenial/Dockerfile | 1 +
test/php/Makefile.am | 1 +
test/php/test_php.ini | 1 +
test/tests.json | 3 ++-
5 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/build/docker/ubuntu-bionic/Dockerfile
b/build/docker/ubuntu-bionic/Dockerfile
index 3566199..a0ed317 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -217,6 +217,7 @@ RUN apt-get install -y --no-install-recommends \
php \
php-cli \
php-dev \
+ php-json \
php-pear \
re2c \
composer
diff --git a/build/docker/ubuntu-xenial/Dockerfile
b/build/docker/ubuntu-xenial/Dockerfile
index 88895a0..5693a2c 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -218,6 +218,7 @@ RUN apt-get install -y --no-install-recommends \
php7.0 \
php7.0-cli \
php7.0-dev \
+ php-json \
php-pear \
re2c \
composer
diff --git a/test/php/Makefile.am b/test/php/Makefile.am
index 5c42321..52765ee 100755
--- a/test/php/Makefile.am
+++ b/test/php/Makefile.am
@@ -26,6 +26,7 @@ stubs: ../ThriftTest.thrift
php_ext_dir:
mkdir -p php_ext_dir
ln -s
../../../lib/php/src/ext/thrift_protocol/modules/thrift_protocol.so php_ext_dir/
+ ln -s "$$(php-config --extension-dir)/json.so" php_ext_dir/
ln -s "$$(php-config --extension-dir)/sockets.so" php_ext_dir/
precross: stubs php_ext_dir
diff --git a/test/php/test_php.ini b/test/php/test_php.ini
index 3f9bb21..aeb67cb 100644
--- a/test/php/test_php.ini
+++ b/test/php/test_php.ini
@@ -1,2 +1,3 @@
extension=thrift_protocol.so
+extension=json.so
extension=sockets.so
diff --git a/test/tests.json b/test/tests.json
index 02ae28a..acede24 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -545,8 +545,9 @@
],
"protocols": [
"binary",
+ "binary:accel",
"compact",
- "binary:accel"
+ "json"
],
"command": [
"php",
