From: Noah Watkins Date: Fri, 2 Nov 2012 16:09:37 +0000 (-0700) Subject: Makefile: include Java test suite artifacts X-Git-Tag: v0.55~152^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a47a96619cbd680b478da906436b874c57c697f2;p=ceph.git Makefile: include Java test suite artifacts Automake has problems handling the naming convention used by Java for inner classes (x$y.class). Signed-off-by: Noah Watkins --- diff --git a/src/java/Makefile.am b/src/java/Makefile.am index 1cfb5a76f6d..f64129f1c3d 100644 --- a/src/java/Makefile.am +++ b/src/java/Makefile.am @@ -53,6 +53,7 @@ BUILT_SOURCES = $(JAVA_H) if WITH_DEBUG JAVA_TEST_CLASSES = $(JAVA_TEST_SRC:test/%.java=%.class) +ESCAPED_JAVA_TEST_CLASSES = com/ceph/fs/CephAllTests\$$1.class CEPH_TEST_PROXY=test/com/ceph/fs/CephMountTest.class @@ -61,7 +62,7 @@ $(CEPH_TEST_PROXY): $(JAVA_TEST_SRC) $(CEPH_PROXY) $(JAVAC) -source 1.5 -target 1.5 test/com/ceph/fs/*.java libcephfs-test.jar: $(CEPH_TEST_PROXY) - $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) + $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) $(ESCAPED_JAVA_TEST_CLASSES:%=-C test %) java_DATA += libcephfs-test.jar