diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-01-15 10:43:51 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-01-15 10:43:51 -0800 |
| commit | 9a5d892e2a2708335a3223d10e268ea932245e15 (patch) | |
| tree | ec087c8182ec538ae0d44921e7f2b9d261965d5f /conformance/Makefile.am | |
| parent | b6ef4015d7eccc6f63dab3dc46e76f9f9f2217ab (diff) | |
| parent | ea956761cc120630c56eacce44b5ed64a181bf97 (diff) | |
| download | protobuf-9a5d892e2a2708335a3223d10e268ea932245e15.tar.gz protobuf-9a5d892e2a2708335a3223d10e268ea932245e15.tar.bz2 protobuf-9a5d892e2a2708335a3223d10e268ea932245e15.zip | |
Merge pull request #1143 from xfxyjwf/fix_java
Fix tests broken by the Java directory change.
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 9703101a..2a43113b 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -114,13 +114,13 @@ MAINTAINERCLEANFILES = \ Makefile.in javac_middleman: ConformanceJava.java protoc_middleman $(other_language_protoc_outputs) - jar=`ls ../java/util/target/*.jar` && javac -classpath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/conformance/Conformance.java + jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classpath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/conformance/Conformance.java @touch javac_middleman conformance-java: javac_middleman @echo "Writing shortcut script conformance-java..." @echo '#! /bin/sh' > conformance-java - @jar=`ls ../java/util/target/*.jar` && echo java -classpath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-java + @jar=`ls ../java/util/target/*jar-with-dependencies.jar` && echo java -classpath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-java @chmod +x conformance-java # Currently the conformance code is alongside the rest of the C# |