From 9681ef42733d4cadf2b560fedfbba5da872cb59e Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Wed, 6 May 2015 14:07:44 -0700
Subject: Run conformance tests against Java for the Travis build.

Change-Id: I8ef8664f7facf86028be3f4f0d5d2efc8a685d6d
---
 .travis.yml             | 1 +
 conformance/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbddac58..354be896 100644
--- a/.travis.yml
+++ b/.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
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index 59bb2576..95343f14 100644
--- a/conformance/Makefile.am
+++ b/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.
-- 
cgit v1.2.3