aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance/Makefile.am
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2015-06-03 12:04:35 -0700
committerGravatar Josh Haberman <jhaberman@gmail.com>2015-06-03 12:08:08 -0700
commitd2b67389b30d1bff1080be3a3d8d7cfb0b81b867 (patch)
tree54b898ff3383b910bb1788b6cc3d812dbef8adea /conformance/Makefile.am
parent96f1d4ada222cbcbea972ee2ac3d20f16bd87ac3 (diff)
Conformance tests can now be excluded based on their names.
This allows us to enable conformance tests even when we know that some tests are failing and need to be fixed. Change-Id: I372f43663008747db6f2b2cf06e6ffa4c6d85b2d
Diffstat (limited to 'conformance/Makefile.am')
-rw-r--r--conformance/Makefile.am2
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