aboutsummaryrefslogtreecommitdiff
path: root/php/phpunit.xml
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2017-08-07 11:47:29 -0700
committerGitHub <noreply@github.com>2017-08-07 11:47:29 -0700
commit3afcded28a6aa9c44adf801ca5bff2133fcf3030 (patch)
treecebd73fdf090a98c32ad1a1c996af9cc8f1f8ad6 /php/phpunit.xml
parent176713d6fbbf72056b009f76e7625f267273bd75 (diff)
parent8f4b8e430a0cf087af423be434cf8d837027c651 (diff)
downloadprotobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.gz
protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.bz2
protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.zip
Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1
Merge master into 3.4.x
Diffstat (limited to 'php/phpunit.xml')
-rw-r--r--php/phpunit.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/php/phpunit.xml b/php/phpunit.xml
index 637467be..d7077038 100644
--- a/php/phpunit.xml
+++ b/php/phpunit.xml
@@ -10,6 +10,7 @@
<file>tests/generated_phpdoc_test.php</file>
<file>tests/map_field_test.php</file>
<file>tests/well_known_test.php</file>
+ <file>tests/descriptors_test.php</file>
<file>tests/generated_service_test.php</file>
</testsuite>
</testsuites>