Mercurial > hg > release > icedtea-web-1.8
changeset 581:dc00e6d5a2f9
Fix unit-test targets to not rely on installed directory
| author | Adam Domurad <adomurad@redhat.com> |
|---|---|
| date | Thu, 06 Dec 2012 10:04:06 -0500 |
| parents | 141cb4463629 |
| children | c6c31f239613 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 05 12:29:24 2012 -0500 +++ b/ChangeLog Thu Dec 06 10:04:06 2012 -0500 @@ -1,3 +1,8 @@ +2012-12-06 Adam Domurad <adomurad@redhat.com> + + * Makefile.am: Fix targets stamps/netx-unit-tests-compile.stamp and + stamps/run-netx-unit-tests.stamp to not rely on installed directory. + 2012-12-05 Saad Mohammad <smohammad@redhat.com> Added new option in itw-settings which allows users to set JVM
--- a/Makefile.am Wed Dec 05 12:29:24 2012 -0500 +++ b/Makefile.am Thu Dec 06 10:04:06 2012 -0500 @@ -969,7 +969,7 @@ mkdir -p $(NETX_UNIT_TEST_DIR) && \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(NETX_UNIT_TEST_DIR) \ - -classpath $(JUNIT_JAR):$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ + -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ @netx-unit-tests-source-files.txt && \ mkdir -p stamps && \ touch $@ @@ -999,7 +999,7 @@ done ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names if WITH_XSLTPROC $(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html