/hg/icedtea: 2 new changesets

Mon Mar 14 18:58:19 UTC 2016

changeset 061fc39249dd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=061fc39249dd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 14 13:13:16 2016 +0000

	PR2873: Fix make distcheck

	2016-03-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR2873: Fix make distcheck
		* Makefile.am:
		(VERSION_SETTINGS_FILE_BACKUP): Added.
		(versioning): Use VERSION_SETTINGS_FILE_BACKUP
		rather than hardcoding a name.
		(clean-versioning): Replace the outdated Defs.gmk
		usage with VERSION_SETTINGS_FILE and
		VERSION_SETTINGS_FILE_BACKUP.
		* NEWS: Updated.


changeset af008bbfeeae in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=af008bbfeeae
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 14 18:52:01 2016 +0000

	PR2880: Add missing test directory in make check

	2016-03-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR2880: Add missing test directory in make check
		* Makefile.am:
		(CRYPTO_CHECK_BUILD_DIR): Locate inside the test
		directory.
		(ECC_CHECK_BUILD_DIR): Likewise.
		(jtregcheck): Create the test directory if it
		doesn't exist.
		(check-tapset-probes): Likewise.
		(check-tapset-jstack): Likewise.
		* NEWS: Updated.


diffstat:

 ChangeLog   |  25 +++++++++++++++++++++++++
 Makefile.am |  17 +++++++++++------
 NEWS        |   2 ++
 3 files changed, 38 insertions(+), 6 deletions(-)

diffs (113 lines):

diff -r db6287c26b47 -r af008bbfeeae ChangeLog

--- a/ChangeLog	Sat Mar 05 02:06:23 2016 +0000
+++ b/ChangeLog	Mon Mar 14 18:52:01 2016 +0000
@@ -1,3 +1,28 @@
+2016-03-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2880: Add missing test directory in make check
+	* Makefile.am:
+	(CRYPTO_CHECK_BUILD_DIR): Locate inside the test
+	directory.
+	(ECC_CHECK_BUILD_DIR): Likewise.
+	(jtregcheck): Create the test directory if it
+	doesn't exist.
+	(check-tapset-probes): Likewise.
+	(check-tapset-jstack): Likewise.
+	* NEWS: Updated.
+
+2016-03-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2873: Fix make distcheck
+	* Makefile.am:
+	(VERSION_SETTINGS_FILE_BACKUP): Added.
+	(versioning): Use VERSION_SETTINGS_FILE_BACKUP
+	rather than hardcoding a name.
+	(clean-versioning): Replace the outdated Defs.gmk
+	usage with VERSION_SETTINGS_FILE and
+	VERSION_SETTINGS_FILE_BACKUP.
+	* NEWS: Updated.
+
 2016-03-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR2826: Provide option to disable SystemTap tests
diff -r db6287c26b47 -r af008bbfeeae Makefile.am
--- a/Makefile.am	Sat Mar 05 02:06:23 2016 +0000
+++ b/Makefile.am	Mon Mar 14 18:52:01 2016 +0000
@@ -68,8 +68,8 @@
 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
-ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
+ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/test/ecccheck.build
 
 # Source directories
 
@@ -86,6 +86,8 @@
 
 VERSION_SETTINGS_FILE = openjdk/jdk/make/ProfileNames.gmk
 
+VERSION_SETTINGS_FILE_BACKUP = $$(basename $(VERSION_SETTINGS_FILE)).bak
+
 JDK_CACERTS_FILE = $(SYSTEM_JDK_DIR)/jre/lib/security/cacerts
 
 CACERTS_FILE = \
@@ -1323,8 +1325,8 @@
 	fi
 
 stamps/versioning.stamp: stamps/patch.stamp
-	mv $(VERSION_SETTINGS_FILE) ProfileNames.gmk.bak
-	cat ProfileNames.gmk.bak > $(VERSION_SETTINGS_FILE)
+	mv $(VERSION_SETTINGS_FILE) $(VERSION_SETTINGS_FILE_BACKUP)
+	cat $(VERSION_SETTINGS_FILE_BACKUP) > $(VERSION_SETTINGS_FILE)
 	icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
 	if test "x$(ENABLE_CACAO)" = "xyes" || \
 	   test "x$(ENABLE_JAMVM)" = "xyes"; then \
@@ -1358,8 +1360,8 @@
 	touch $@
 
 clean-versioning:
-	if [ -e Defs.gmk.bak ] ; then \
-	  mv Defs.gmk.bak openjdk/jdk/make/common/shared/Defs.gmk ; \
+	if [ -e $(VERSION_SETTINGS_FILE_BACKUP) ] ; then \
+	  mv $(VERSION_SETTINGS_FILE_BACKUP) $(VERSION_SETTINGS_FILE) ; \
 	fi
 	rm -f stamps/versioning.stamp
 
@@ -2180,6 +2182,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; \
@@ -2213,6 +2216,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_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
@@ -2224,6 +2228,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_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
diff -r db6287c26b47 -r af008bbfeeae NEWS
--- a/NEWS	Sat Mar 05 02:06:23 2016 +0000
+++ b/NEWS	Mon Mar 14 18:52:01 2016 +0000
@@ -146,6 +146,8 @@
   - PR2853: Revert AArch64 jvm.cfg divergence
   - PR2853: Revert changes to libpng source code now 8078245 is in place.
   - PR2865: Handle uninstallation.
+  - PR2873: Fix make distcheck.
+  - PR2880: Add missing test directory in make check.
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck
