aboutsummaryrefslogtreecommitdiff
path: root/phpunit.xml
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2016-11-17 17:04:30 -0800
committerAdam Cozzette <acozzette@google.com>2016-11-17 17:04:30 -0800
commit5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd (patch)
tree50d8116271f024e16334785464c794da85f3ce12 /phpunit.xml
parent5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (diff)
parentcd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff)
downloadprotobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.gz
protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.bz2
protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.zip
Merge branch 'master' into down-integrate-with-msvc-fix
Diffstat (limited to 'phpunit.xml')
-rw-r--r--phpunit.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpunit.xml b/phpunit.xml
index d311c509..f9118d8e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,6 +8,7 @@
<file>php/tests/encode_decode_test.php</file>
<file>php/tests/generated_class_test.php</file>
<file>php/tests/map_field_test.php</file>
+ <file>php/tests/well_known_test.php</file>
</testsuite>
</testsuites>
</phpunit>