diff options
| author | Yilun Chong <chongyilun250@sina.com> | 2017-06-30 17:38:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 17:38:50 -0700 |
| commit | e82ba0b8026eb16c40ceba861f02c643c36e8232 (patch) | |
| tree | 2aa89a917c6091923682221026507aa9eea1aba4 /conformance/Makefile.am | |
| parent | 726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff) | |
| parent | ecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (diff) | |
| download | protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.gz protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.bz2 protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.zip | |
Merge branch 'master' into ConformanceTestYilunChong
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 58eb7f59..dcd1714c 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -315,7 +315,7 @@ conformance-csharp: $(other_language_protoc_outputs) conformance-php: @echo "Writing shortcut script conformance-php..." @echo '#! /bin/sh' > conformance-php - @echo 'php ./conformance_php.php' >> conformance-php + @echo 'php -d auto_prepend_file=autoload.php ./conformance_php.php' >> conformance-php @chmod +x conformance-php conformance-php-c: @@ -346,6 +346,9 @@ test_php: protoc_middleman conformance-test-runner conformance-php $(other_langu test_php_c: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs) ./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c.txt ./conformance-php-c +test_php_zts_c: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs) + ./conformance-test-runner --enforce_recommended --failure_list failure_list_php_zts_c.txt ./conformance-php-c + # These depend on library paths being properly set up. The easiest way to # run them is to just use "tox" from the python dir. test_python: protoc_middleman conformance-test-runner |