aboutsummaryrefslogtreecommitdiff
path: root/conformance/Makefile.am
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2016-09-19 13:45:07 -0700
committerBo Yang <teboring@google.com>2016-09-19 17:42:40 -0700
commit98835fb8f8a8f144f2a1eac0b833ff83f4a05f54 (patch)
tree49504df5c2020eb085c1826548c10a3cbd188e12 /conformance/Makefile.am
parentb5bbdb0967109fbae7bfc423ef3cd6dc776359b6 (diff)
downloadprotobuf-98835fb8f8a8f144f2a1eac0b833ff83f4a05f54.tar.gz
protobuf-98835fb8f8a8f144f2a1eac0b833ff83f4a05f54.tar.bz2
protobuf-98835fb8f8a8f144f2a1eac0b833ff83f4a05f54.zip
Integrate internal changes
Diffstat (limited to 'conformance/Makefile.am')
-rw-r--r--conformance/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index 28ac3c8a..bdd23a07 100644
--- a/conformance/Makefile.am
+++ b/conformance/Makefile.am
@@ -251,31 +251,31 @@ conformance-csharp: $(other_language_protoc_outputs)
# Targets for actually running tests.
test_cpp: protoc_middleman conformance-test-runner conformance-cpp
- ./conformance-test-runner --failure_list failure_list_cpp.txt ./conformance-cpp
+ ./conformance-test-runner --enforce_recommended --failure_list failure_list_cpp.txt ./conformance-cpp
test_java: protoc_middleman conformance-test-runner conformance-java
- ./conformance-test-runner --failure_list failure_list_java.txt ./conformance-java
+ ./conformance-test-runner --enforce_recommended --failure_list failure_list_java.txt ./conformance-java
test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite
- ./conformance-test-runner ./conformance-java-lite
+ ./conformance-test-runner --enforce_recommended ./conformance-java-lite
test_csharp: protoc_middleman conformance-test-runner conformance-csharp
- ./conformance-test-runner --failure_list failure_list_csharp.txt ./conformance-csharp
+ ./conformance-test-runner --enforce_recommended --failure_list failure_list_csharp.txt ./conformance-csharp
test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outputs)
- RUBYLIB=../ruby/lib:. ./conformance-test-runner --failure_list failure_list_ruby.txt ./conformance_ruby.rb
+ RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_ruby.txt ./conformance_ruby.rb
# 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
- ./conformance-test-runner --failure_list failure_list_python.txt ./conformance_python.py
+ ./conformance-test-runner --enforce_recommended --failure_list failure_list_python.txt ./conformance_python.py
test_python_cpp: protoc_middleman conformance-test-runner
- ./conformance-test-runner --failure_list failure_list_python_cpp.txt ./conformance_python.py
+ ./conformance-test-runner --enforce_recommended --failure_list failure_list_python_cpp.txt ./conformance_python.py
if OBJC_CONFORMANCE_TEST
test_objc: protoc_middleman conformance-test-runner conformance-objc
- ./conformance-test-runner --failure_list failure_list_objc.txt ./conformance-objc
+ ./conformance-test-runner --enforce_recomemnded --failure_list failure_list_objc.txt ./conformance-objc
endif