diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
| commit | e2acd854250b449a3fdeef2ad52402c4c5d78259 (patch) | |
| tree | a08126762b6c76d56fde8ce443f8dff36408b6e0 /conformance/Makefile.am | |
| parent | d9dc05e500807a6f0cd10d4637c599acc9a6aecf (diff) | |
| parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
| download | protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.gz protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.bz2 protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.zip | |
Merged master
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 95343f14..cccbac9e 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -57,7 +57,7 @@ conformance-java: javac_middleman # Targets for actually running tests. test_cpp: protoc_middleman conformance-test-runner conformance-cpp - ./conformance-test-runner ./conformance-cpp + ./conformance-test-runner --failure_list failure_list_cpp.txt ./conformance-cpp test_java: protoc_middleman conformance-test-runner conformance-java ./conformance-test-runner ./conformance-java |