From e4d80545e939552b8a8f01f866ce30185d226776 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 30 Jan 2015 17:04:56 -0500 Subject: [PATCH] Fix: test: java-jul:missing static test files for dist and out of tree build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- tests/regression/ust/java-jul/Makefile.am | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am index 4446c524f..286e3df22 100644 --- a/tests/regression/ust/java-jul/Makefile.am +++ b/tests/regression/ust/java-jul/Makefile.am @@ -1,4 +1,3 @@ -if BUILD_JAVA_AGENT noinst_SCRIPTS = test_java_jul JTestLTTng.java EXTRA_DIST = test_java_jul JTestLTTng.java @@ -11,20 +10,25 @@ endif AGENT_JAR_FILE=$(java_agent_jar_path) -all-local: JTestLTTng.class +# Still need to copy test files in case of out of tree build +if BUILD_JAVA_AGENT +all-local: static_file JTestLTTng.class %.class: %.java $(JCC) -d "$(builddir)" -cp "$(AGENT_JAR_FILE):." $< +else +all-local: static_file +endif # BUILD_JAVA_AGENT -JTestLTTng.class: JTestLTTng.java -all-local: +static_file: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ for script in $(EXTRA_DIST); do \ cp -f $(srcdir)/$$script $(builddir); \ done; \ fi + clean-local: rm -f *.class @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ @@ -33,4 +37,3 @@ clean-local: done; \ fi -endif # BUILD_JAVA_AGENT -- 2.34.1