Mercurial > hg > icedtea7

changeset 2858:1d6fc4bd9dd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2894: Add missing test directory in make check 2016-03-14 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2894: Add missing test directory in make check * Makefile.am: (CRYPTO_CHECK_BUILD_DIR): Locate inside the test directory. (jtregcheck): Create the test directory if it doesn't exist. (check-tapset-probes): Likewise. (check-tapset-jstack): Likewise. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 25 Mar 2016 03:08:56 +0000
parents 86faa1802483
children 496391ff414d
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 25 03:02:15 2016 +0000
+++ b/ChangeLog	Fri Mar 25 03:08:56 2016 +0000
@@ -1,3 +1,15 @@
+2016-03-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2894: Add missing test directory in make check
+	* Makefile.am:
+	(CRYPTO_CHECK_BUILD_DIR): Locate inside the test
+	directory.
+	(jtregcheck): Create the test directory if it
+	doesn't exist.
+	(check-tapset-probes): Likewise.
+	(check-tapset-jstack): Likewise.
+	* NEWS: Updated.
+
 2016-01-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2893: test/tapset/jstaptest.pl should be executable
--- a/Makefile.am	Fri Mar 25 03:02:15 2016 +0000
+++ b/Makefile.am	Fri Mar 25 03:08:56 2016 +0000
@@ -68,7 +68,7 @@
 STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
 STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
 JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
 STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
 STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
 
@@ -2801,6 +2801,7 @@
 	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
 
 jtregcheck: $(TESTS_TO_RUN)
+	$(MKDIR_P) test
 	for i in $(TEST_SUITES); do \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
 	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
@@ -2834,6 +2835,7 @@
 	if test "x${PERL}" = "x"; then \
 	  echo "ERROR: Perl not found"; exit -1; \
 	fi
+	$(MKDIR_P) test
 	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
 	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
@@ -2844,6 +2846,7 @@
 	if test "x${PERL}" = "x"; then \
 	  echo "ERROR: Perl not found"; exit -1; \
 	fi
+	$(MKDIR_P) test
 	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
 	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
--- a/NEWS	Fri Mar 25 03:02:15 2016 +0000
+++ b/NEWS	Fri Mar 25 03:08:56 2016 +0000
@@ -17,6 +17,7 @@
 * Bug fixes
   - PR2803: Make system CUPS optional
   - PR2893: test/tapset/jstaptest.pl should be executable
+  - PR2894: Add missing test directory in make check.
 * CACAO
   - PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed