aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-02-09 14:15:26 -0800
committerJisi Liu <jisi.liu@gmail.com>2015-02-09 14:15:26 -0800
commitd1bbd856af00b8bce4cc7a01c7ed7ae03abe3f42 (patch)
tree300cd3515de083567c455075d16468ef6c83bd0a
parent33ccbcbe26efd566715eba83460db62c0f750349 (diff)
downloadprotobuf-d1bbd856af00b8bce4cc7a01c7ed7ae03abe3f42.tar.gz
protobuf-d1bbd856af00b8bce4cc7a01c7ed7ae03abe3f42.tar.bz2
protobuf-d1bbd856af00b8bce4cc7a01c7ed7ae03abe3f42.zip
Merge the javanano map test into the main test target.
-rw-r--r--javanano/pom.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/javanano/pom.xml b/javanano/pom.xml
index 1f81fb3d..409d8d61 100644
--- a/javanano/pom.xml
+++ b/javanano/pom.xml
@@ -94,10 +94,6 @@
<arg value="src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto" />
<arg value="src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto" />
<arg value="src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto" />
- </exec>
- <exec executable="../src/protoc">
- <arg value="--javanano_out=generate_equals=true:target/generated-test-sources" />
- <arg value="--proto_path=src/test/java/com" />
<arg value="src/test/java/com/google/protobuf/nano/map_test.proto" />
</exec>
<exec executable="../src/protoc">