Merge pull request #349 from haberman/conformance-java-travis

Run conformance tests against Java for the Travis build.

.travis.yml

@@ -14,6 +14,7 @@ script:
   - cd python && python setup.py build && python setup.py test && cd ..
   - export LD_LIBRARY_PATH=../src/.libs
   - cd python && python setup.py build --cpp_implementation && python setup.py test --cpp_implementation && cd ..
+  - cd conformance && make test_java && cd ..
   - make distcheck -j2
 notifications:
   email: false

conformance/Makefile.am

@@ -46,13 +46,13 @@ MAINTAINERCLEANFILES =   \
   Makefile.in
 
 javac_middleman: ConformanceJava.java protoc_middleman
-	javac ConformanceJava.java com/google/protobuf/conformance/Conformance.java
+	javac -classpath ../java/target/classes 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
-	@echo 'java -classpath .:$$CLASSPATH ConformanceJava "$$@"' >> conformance-java
+	@echo 'java -classpath .:../java/target/classes ConformanceJava "$$@"' >> conformance-java
 	@chmod +x conformance-java
 
 # Targets for actually running tests.