/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset d1c1c1e9fa40 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d1c1c1e9fa40
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 15 11:43:19 2012 +0100

	Guard reversion of java.security so the mv command is not run by non-NSS builds.

	2012-08-14  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(clean-add-nss): Only move java.security.old
		if it exists.
		(clean-add-nss-debug): Likewise.
		(clean-add-nss-ecj): Likewise.


changeset a5758742058d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a5758742058d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 15 12:17:03 2012 +0100

	PR1113: Add tapset tests to distribution.

	2012-08-14  Andrew John Hughes  <ahughes at redhat.com>

		PR1113: Include tapset tests in distribution.
		* Makefile.am:
		(TAPSET_TEST_SRCS): Like tapset test sources.
		(EXTRA_DIST): Add TAPSET_TEST_SRCS.
		* NEWS: Updated.


diffstat:

 ChangeLog   |  16 ++++++++++++++++
 Makefile.am |  39 ++++++++++++++++++++++++++++++++-------
 NEWS        |   1 +
 3 files changed, 49 insertions(+), 7 deletions(-)

diffs (111 lines):

diff -r b8d3d110abfe -r a5758742058d ChangeLog
--- a/ChangeLog	Mon Aug 13 16:26:21 2012 +0200
+++ b/ChangeLog	Wed Aug 15 12:17:03 2012 +0100
@@ -1,3 +1,19 @@
+2012-08-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR1113: Include tapset tests in distribution.
+	* Makefile.am:
+	(TAPSET_TEST_SRCS): Like tapset test sources.
+	(EXTRA_DIST): Add TAPSET_TEST_SRCS.
+	* NEWS: Updated.
+
+2012-08-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-add-nss): Only move java.security.old
+	if it exists.
+	(clean-add-nss-debug): Likewise.
+	(clean-add-nss-ecj): Likewise.
+
 2012-08-13  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	JamVM
diff -r b8d3d110abfe -r a5758742058d Makefile.am
--- a/Makefile.am	Mon Aug 13 16:26:21 2012 +0200
+++ b/Makefile.am	Wed Aug 15 12:17:03 2012 +0100
@@ -188,6 +188,18 @@
 # Relative path to JTreg tool
 JTREG_DIR = src/jtreg
 JTREG_SRCS = $(top_srcdir)/$(JTREG_DIR)
+TAPSET_TEST_SRCS = \
+	$(top_srcdir)/test/tapset/ClassUnloadedProbeTester.java \
+	$(top_srcdir)/test/tapset/JNIStapTest.c \
+	$(top_srcdir)/test/tapset/JNITestClass.c \
+	$(top_srcdir)/test/tapset/JNITestClass.h \
+	$(top_srcdir)/test/tapset/JNITestClass.java \
+	$(top_srcdir)/test/tapset/jstaptest.pl \
+	$(top_srcdir)/test/tapset/RunWrapper.java \
+	$(top_srcdir)/test/tapset/StapJNIClassLoader.java \
+	$(top_srcdir)/test/tapset/StapURLClassLoader.java \
+	$(top_srcdir)/test/tapset/SystemtapTester.java \
+	$(top_srcdir)/test/tapset/TestingRunner.java
 
 # Patch list
 
@@ -655,7 +667,8 @@
 	scripts/jni_desc \
 	rewriter/agpl-3.0.txt \
 	$(REWRITER_SRCS) \
-	THANKYOU
+	THANKYOU \
+	$(TAPSET_TEST_SRCS)
 
 # Top-Level Targets
 # =================
@@ -1647,8 +1660,12 @@
 clean-add-nss:
 	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
 	rm -vf $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
-	mv -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
-	mv -vf $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security.old ] ; then \
+	  mv -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,} ; \
+	fi
+	if [ -e $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security.old ] ; then \
+	  mv -vf $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,} ; \
+	fi
 	rm -f stamps/add-nss.stamp
 
 stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
@@ -1694,8 +1711,12 @@
 clean-add-nss-debug:
 	rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
 	rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
-	mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
-	mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security.old ] ; then \
+	  mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,} ; \
+	fi
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security.old ] ; then \
+	  mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,} ; \
+	fi
 	rm -f stamps/add-nss-debug.stamp
 
 stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
@@ -1840,8 +1861,12 @@
 clean-add-nss-ecj:
 	rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
 	rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
-	mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
-	mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
+	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security.old ] ; then \
+	  mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,} ; \
+	fi
+	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security.old ] ; then \
+	  mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,} ; \
+	fi
 	rm -f stamps/add-nss-ecj.stamp
 
 stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
diff -r b8d3d110abfe -r a5758742058d NEWS
--- a/NEWS	Mon Aug 13 16:26:21 2012 +0200
+++ b/NEWS	Wed Aug 15 12:17:03 2012 +0100
@@ -21,6 +21,7 @@
 * Bug fixes
   - PR902: PulseAudioClip getMicrosecondsLength() returns length in milliseconds, not microseconds
   - PR1050: Stream objects not garbage collected
+  - PR1113: Add tapset tests to distribution.
 * JamVM
   - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
   - PPC: Don't use lwsync if it isn't supported