/hg/icedtea: 11 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 4 17:31:18 UTC 2015
changeset d4b7c0a97901 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4b7c0a97901
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 15:00:16 2015 +0000
PR2256: Add tapset tests.
2015-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(clean-tests): Add dependency on clean-jtreg-reports.
(clean-local): Drop clean-jtreg-reports.
* NEWS: Updated.
2012-03-23 Jon VanAlten <jon.vanalten at redhat.com>
* Makefile.am:
(check-local): Depend on check-tapset.
(clean-tests): New target to group test cleanup
rules.
(clean-local): Depend on clean-tests rather than
clean-jtreg.
(.PHONY): Add clean-tests and clean-tapset-report.
(check-tapset): Add target to run tapset tests.
(clean-tapset-report): Cleanup tapset test output.
* tapset/hotspot_jni.stp.in:
Add notes regarding required JVM option to Get<PrimitiveType>Field
family of probe aliases.
* test/tapset/ClassUnloadedProbeTester.java:
Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
* test/tapset/JNIStapTest.c:
Likewise.
* test/tapset/JNITestClass.c:
Likewise.
* test/tapset/JNITestClass.h:
Likewise.
* test/tapset/JNITestClass.java:
Likewise.
* test/tapset/RunWrapper.java:
Likewise.
* test/tapset/StapJNIClassLoader.java:
Likewise.
* test/tapset/StapURLClassLoader.java:
Likewise.
* test/tapset/SystemtapTester.java:
Likewise.
* test/tapset/TestingRunner.java:
Likewise.
* test/tapset/jstaptest.pl:
Wrapper script, compiles and runs tests for tapsets.
changeset b833c6a3aa60 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b833c6a3aa60
author: Mark Wielaard <mark at klomp.org>
date: Fri Mar 23 22:39:35 2012 +0100
PR2256: Add jstack tests to test/tapset/jstaptest.pl.
changeset 34975b977043 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=34975b977043
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 26 22:07:22 2012 +0200
PR2256: jstaptest.pl: thread_start and stop thread id can be any positive number.
tid was hard coded as being '8', but newer hotspot might start more
than 7 background threads before the first user thread is started.
So allow tid to be any positive number.
changeset 8e4fc4803bd3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8e4fc4803bd3
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 27 15:54:44 2012 -0400
PR2256: Fix JRE arch dir for x86 in tapset test script
2012-06-26 Omair Majid <omajid at redhat.com>
* test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86.
changeset 7fad2a5465dd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7fad2a5465dd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 15:05:45 2015 +0000
PR2256: Add UseCompressedOops tests to jstaptest.pl.
* Makefile.am (check-tapset-probes): New target.
(check-tapset-jstack): Likewise.
(check-tapset): Depend on check-tapset-probes check-tapset-jstack.
* test/tapset/jstaptest.pl (process_args): Add -p [$run_test_probes]
and -j [$run_test_jstack].
(test_jstack): Takes argument to pass to java process.
Pass -XX:+UseCompressedOops and/or -Xmx5G.
changeset 9fe29e53b2f1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9fe29e53b2f1
author: Mark Wielaard <mark at klomp.org>
date: Mon Aug 06 17:12:29 2012 +0200
PR2256: test/tapset/jstaptest.pl: Expect non-zero value for NewObjectA.return.
changeset ad09cd636ff8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ad09cd636ff8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 15:09:23 2015 +0000
PR2256: Fix make distcheck broken by addition of SystemTap tests.
2012-05-30 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(EXTRA_DIST): Add test/tapset.
(clean-jtreg): Remove test/jtreg if empty.
changeset 4005e0143bc8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4005e0143bc8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 16:20:09 2015 +0000
PR1291: Ensure unlimited crypto policy is in place.
2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1291: Ensure unlimited crypto policy is in place.
* Makefile.am:
(CRYPTO_CHECK_BUILD_DIR): New variable.
(CRYPTO_CHECK_SRCS): Likewise.
(EXTRA_DIST): Add CRYPTO_CHECK_SRCS.
(.PHONY): Add new clean targets.
(check-crypto): Run the crypto checker on a normal
stage 2 build.
(clean-check-crypto): Delete the check-crypto stamp.
(check-crypto-debug): Run the crypto checker on a
debug stage 2 build.
(clean-check-crypto-debug): Delete the
check-crypto-debug stamp.
(icedtea-stage2): Depend on check-crypto.
(clean-icedtea-stage2): Depend on clean-check-crypto.
(icedtea-debug-stage2): Depend on check-crypto-debug.
(clean-icedtea-debug-stage2): Depend on
clean-check-crypto-debug.
(check-crypto-boot): Run the crypto checker on
the stage 1 build.
(clean-check-crypto-boot): Delete the
check-crypto-boot stamp.
(icedtea-stage1): Depend on check-crypto-boot.
(clean-icedtea-stage1): Depend on
clean-check-crypto-boot.
(cryptocheck): Build the crypto checker.
(clean-cryptocheck): Revert cryptocheck.
* NEWS: Updated.
* TestCryptoLevel.java:
Checks whether the unlimited crypto policy is in
place or not.
changeset 0b1bc8378f34 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0b1bc8378f34
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 17:09:59 2015 +0000
PR1291: Make clean-crypto targets depend on JDK being built.
2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(check-crypto): Depend on icedtea.stamp.
(add-archive): Move into correct position in file.
(clean-add-archive): Likewise.
(check-crypto-debug): Depend on icedtea-debug.stamp.
(clean-crypto-boot): Depend on icedtea-boot.stamp.
changeset 5da956ae51a8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5da956ae51a8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 17:25:22 2015 +0000
PR2257: clean-extract-nashorn rule is never run
2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(clean-extract-openjdk): Depend on clean-extract-nashorn.
* NEWS: Updated.
changeset 6d2ddb408564 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6d2ddb408564
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 04 17:31:04 2015 +0000
PR1291: Actually invoke clean-cryptocheck.
2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(.PHONY): Add clean-cryptocheck.
(clean-local): Likewise.
diffstat:
ChangeLog | 131 +
Makefile.am | 120 +-
NEWS | 3 +
TestCryptoLevel.java | 78 +
tapset/hotspot_jni.stp.in | 20 +-
test/tapset/ClassUnloadedProbeTester.java | 38 +
test/tapset/JNIStapTest.c | 2107 +++++++++++++++++++++++++++++
test/tapset/JNITestClass.c | 7 +
test/tapset/JNITestClass.h | 21 +
test/tapset/JNITestClass.java | 121 +
test/tapset/RunWrapper.java | 21 +
test/tapset/StapJNIClassLoader.java | 64 +
test/tapset/StapURLClassLoader.java | 24 +
test/tapset/SystemtapTester.java | 202 ++
test/tapset/TestingRunner.java | 82 +
test/tapset/jstaptest.pl | 1045 ++++++++++++++
16 files changed, 4070 insertions(+), 14 deletions(-)
diffs (truncated from 4413 to 500 lines):
diff -r a9271fe74b8d -r 6d2ddb408564 ChangeLog
--- a/ChangeLog Tue Mar 03 00:15:26 2015 +0000
+++ b/ChangeLog Wed Mar 04 17:31:04 2015 +0000
@@ -1,3 +1,134 @@
+2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (.PHONY): Add clean-cryptocheck.
+ (clean-local): Likewise.
+
+2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (clean-extract-openjdk): Depend on clean-extract-nashorn.
+ * NEWS: Updated.
+
+2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (check-crypto): Depend on icedtea.stamp.
+ (check-crypto-debug): Depend on icedtea-debug.stamp.
+ (clean-crypto-boot): Depend on icedtea-boot.stamp.
+
+2013-06-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1291: Ensure unlimited crypto policy is in place.
+ * Makefile.am:
+ (CRYPTO_CHECK_BUILD_DIR): New variable.
+ (CRYPTO_CHECK_SRCS): Likewise.
+ (EXTRA_DIST): Add CRYPTO_CHECK_SRCS.
+ (.PHONY): Add new clean targets.
+ (check-crypto): Run the crypto checker on a normal
+ stage 2 build.
+ (clean-check-crypto): Delete the check-crypto stamp.
+ (check-crypto-debug): Run the crypto checker on a
+ debug stage 2 build.
+ (clean-check-crypto-debug): Delete the
+ check-crypto-debug stamp.
+ (icedtea-stage2): Depend on check-crypto.
+ (clean-icedtea-stage2): Depend on clean-check-crypto.
+ (icedtea-debug-stage2): Depend on check-crypto-debug.
+ (clean-icedtea-debug-stage2): Depend on
+ clean-check-crypto-debug.
+ (check-crypto-boot): Run the crypto checker on
+ the stage 1 build.
+ (clean-check-crypto-boot): Delete the
+ check-crypto-boot stamp.
+ (icedtea-stage1): Depend on check-crypto-boot.
+ (clean-icedtea-stage1): Depend on
+ clean-check-crypto-boot.
+ (cryptocheck): Build the crypto checker.
+ (clean-cryptocheck): Revert cryptocheck.
+ * NEWS: Updated.
+ * TestCryptoLevel.java:
+ Checks whether the unlimited crypto policy is in
+ place or not.
+
+2012-05-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (EXTRA_DIST): Add test/tapset.
+ (clean-jtreg): Remove test/jtreg if empty.
+
+2012-08-06 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl (probestrings): Expect non-zero value
+ for hotspot.jni.NewObjectA.return.
+
+2012-08-03 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (check-tapset-probes): New target.
+ (check-tapset-jstack): Likewise.
+ (check-tapset): Depend on check-tapset-probes check-tapset-jstack.
+ * test/tapset/jstaptest.pl (process_args): Add -p [$run_test_probes]
+ and -j [$run_test_jstack].
+ (test_jstack): Takes argument to pass to java process.
+ Pass -XX:+UseCompressedOops and/or -Xmx5G.
+
+2012-06-26 Omair Majid <omajid at redhat.com>
+
+ * test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86.
+
+2012-03-26 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: thread_start and thread_stop thread id
+ can be any positive number.
+
+2012-03-23 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: Add jstack tests.
+
+2015-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (clean-tests): Add dependency on clean-jtreg-reports.
+ (clean-local): Drop clean-jtreg-reports.
+ * NEWS: Updated.
+
+2012-03-23 Jon VanAlten <jon.vanalten at redhat.com>
+
+ * Makefile.am:
+ (check-local): Depend on check-tapset.
+ (clean-tests): New target to group test cleanup
+ rules.
+ (clean-local): Depend on clean-tests rather than
+ clean-jtreg.
+ (.PHONY): Add clean-tests and clean-tapset-report.
+ (check-tapset): Add target to run tapset tests.
+ (clean-tapset-report): Cleanup tapset test output.
+ * tapset/hotspot_jni.stp.in:
+ Add notes regarding required JVM option to Get<PrimitiveType>Field
+ family of probe aliases.
+ * test/tapset/ClassUnloadedProbeTester.java:
+ Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
+ * test/tapset/JNIStapTest.c:
+ Likewise.
+ * test/tapset/JNITestClass.c:
+ Likewise.
+ * test/tapset/JNITestClass.h:
+ Likewise.
+ * test/tapset/JNITestClass.java:
+ Likewise.
+ * test/tapset/RunWrapper.java:
+ Likewise.
+ * test/tapset/StapJNIClassLoader.java:
+ Likewise.
+ * test/tapset/StapURLClassLoader.java:
+ Likewise.
+ * test/tapset/SystemtapTester.java:
+ Likewise.
+ * test/tapset/TestingRunner.java:
+ Likewise.
+ * test/tapset/jstaptest.pl:
+ Wrapper script, compiles and runs tests for tapsets.
+
2015-03-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r a9271fe74b8d -r 6d2ddb408564 Makefile.am
--- a/Makefile.am Tue Mar 03 00:15:26 2015 +0000
+++ b/Makefile.am Wed Mar 04 17:31:04 2015 +0000
@@ -63,6 +63,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
# Source directories
@@ -209,6 +210,7 @@
# Sources list
REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
# Patch list
@@ -488,22 +490,31 @@
scripts/jni_desc \
rewriter/agpl-3.0.txt \
$(REWRITER_SRCS) \
- THANKYOU
+ THANKYOU test/tapset \
+ $(CRYPTO_CHECK_SRCS)
# Top-Level Targets
# =================
all-local: icedtea-stage2
-check-local: jtregcheck
+check-local: jtregcheck check-tapset
-clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
+ if [ -e test ] ; then \
+ rmdir test ; \
+ fi \
+ fi
+
+clean-local: clean-tests clean-pulse-java \
clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter
+ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
+ clean-cryptocheck
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -534,7 +545,9 @@
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug \
clean-download-nashorn clean-extract-nashorn clean-download-hotspot \
- clean-add-archive clean-add-archive-debug clean-add-archive-boot
+ clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
+ clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
+ clean-tests clean-tapset-report
env:
@echo 'unset JAVA_HOME'
@@ -963,7 +976,8 @@
clean-extract-openjdk: clean-overlay clean-versioning \
clean-patch-fsg clean-remove-intree-libraries \
- clean-sanitise-openjdk clean-extract-hotspot
+ clean-sanitise-openjdk clean-extract-hotspot \
+ clean-extract-nashorn
rm -rf openjdk
rm -f stamps/extract-openjdk.stamp
@@ -1583,6 +1597,16 @@
rm -f stamps/icedtea-debug-configure.stamp
rm -f stamps/icedtea-debug.stamp
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
+ if [ -e $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+clean-check-crypto:
+ rm -f stamps/check-crypto.stamp
+
stamps/add-archive.stamp: stamps/icedtea.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
@@ -1599,6 +1623,16 @@
rm -vf $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive.stamp
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
+ if [ -e $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+clean-check-crypto-debug:
+ rm -f stamps/check-crypto-debug.stamp
+
stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
@@ -1616,20 +1650,22 @@
rm -f stamps/add-archive-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-archive.stamp
+ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/check-crypto.stamp \
+ stamps/add-archive.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage2: clean-add-jamvm clean-add-archive
+clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive
rm -f stamps/icedtea-stage2.stamp
stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
- stamps/add-archive-debug.stamp
+ stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp
mkdir -p stamps
touch $@
-clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-add-archive-debug
+clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \
+ clean-add-archive-debug
rm -f stamps/icedtea-debug-stage2.stamp
# OpenJDK boot Targets
@@ -1695,6 +1731,16 @@
rm -f stamps/icedtea-boot-configure.stamp
rm -f stamps/icedtea-boot.stamp
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
+ if [ -e $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+clean-check-crypto-boot:
+ rm -f stamps/check-crypto-boot.stamp
+
stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
@@ -1711,11 +1757,12 @@
rm -vf $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive-boot.stamp
-stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp stamps/add-archive-boot.stamp
+stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp stamps/check-crypto-boot.stamp \
+ stamps/add-archive-boot.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage1: clean-add-archive-boot
+clean-icedtea-stage1: clean-check-crypto-boot clean-add-archive-boot
rm -f stamps/icedtea-stage1.stamp
# PulseAudio based mixer
@@ -2091,6 +2138,11 @@
clean-jtreg:
rm -rf test/jtreg/classes
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
+ if [ -e test/jtreg ] ; then \
+ rmdir test/jtreg ; \
+ fi ; \
+ fi
rm -f test/jtreg.jar
rm -f stamps/jtreg.stamp
@@ -2173,6 +2225,29 @@
$(jtreg_processes); \
fi
+check-tapset-probes:
+if ENABLE_SYSTEMTAP
+ $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+ -S $(abs_top_srcdir)/test/tapset \
+ -a test/check-stap.log -p
+endif
+
+check-tapset-jstack:
+if ENABLE_SYSTEMTAP
+ $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+ -S $(abs_top_srcdir)/test/tapset \
+ -a test/check-stap.log -j
+endif
+
+check-tapset: check-tapset-probes check-tapset-jstack
+
+clean-tapset-report:
+if ENABLE_SYSTEMTAP
+ rm -f test/check-stap.log
+endif
+
# Support classes for non-OpenJDK bootstraps
rt-source-files.txt: $(OPENJDK_BOOT_TREE)
@@ -2218,6 +2293,19 @@
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \
fi
+# Crypto Level Check
+
+stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
+ mkdir -p $(CRYPTO_CHECK_BUILD_DIR)
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS)
+ mkdir -p stamps
+ touch $@
+
+clean-cryptocheck:
+ rm -rf $(CRYPTO_CHECK_BUILD_DIR)
+ rm -f stamps/cryptocheck.stamp
+
# Target Aliases
# ===============
@@ -2241,8 +2329,16 @@
cacao: stamps/cacao.stamp
+check-crypto: stamps/check-crypto.stamp
+
+check-crypto-boot: stamps/check-crypto-boot.stamp
+
+check-crypto-debug: stamps/check-crypto-debug.stamp
+
clone-boot: stamps/clone-boot.stamp
+cryptocheck: stamps/cryptocheck.stamp
+
download: stamps/download.stamp
download-cacao: stamps/download-cacao.stamp
diff -r a9271fe74b8d -r 6d2ddb408564 NEWS
--- a/NEWS Tue Mar 03 00:15:26 2015 +0000
+++ b/NEWS Wed Mar 04 17:31:04 2015 +0000
@@ -27,6 +27,7 @@
- PR1275: Provide option to turn off downloading of tarballs
- PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
- PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
+ - PR1291: Ensure unlimited crypto policy is in place.
- PR1325: Only add classes to rt-source-files.txt if actually needed
- PR1346: Filter out -j option to make
- PR1347: Update list of checked JDKs
@@ -54,6 +55,8 @@
- PR2212: DGifCloseFile call should check the return value, not the error code, for failure
- PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
- PR2248: HotSpot tarball fails verification after download
+ - PR2256: Add SystemTap tests
+ - PR2257: clean-extract-nashorn rule is never run
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
diff -r a9271fe74b8d -r 6d2ddb408564 TestCryptoLevel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/TestCryptoLevel.java Wed Mar 04 17:31:04 2015 +0000
@@ -0,0 +1,78 @@
+/* TestCryptoLevel -- Ensure unlimited crypto policy is in use.
+ Copyright (C) 2012 Red Hat, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
+import java.security.Permission;
+import java.security.PermissionCollection;
+
+public class TestCryptoLevel
+{
+ public static void main(String[] args)
+ throws NoSuchFieldException, ClassNotFoundException,
+ IllegalAccessException, InvocationTargetException
+ {
+ Class<?> cls = null;
+ Method def = null, exempt = null;
+
+ try
+ {
+ cls = Class.forName("javax.crypto.JceSecurity");
+ }
+ catch (ClassNotFoundException ex)
+ {
+ System.err.println("Running a non-Sun JDK.");
+ System.exit(0);
+ }
+ catch (ExceptionInInitializerError err)
+ {
+ System.err.println("Failed to initialise JceSecurity: "
+ + err.getCause().getCause().getMessage());
+ System.exit(-2);
+ }
+ try
+ {
+ def = cls.getDeclaredMethod("getDefaultPolicy");
+ exempt = cls.getDeclaredMethod("getExemptPolicy");
+ }
+ catch (NoSuchMethodException ex)
+ {
+ System.err.println("Running IcedTea with the original crypto patch.");
+ System.exit(0);
+ }
+ def.setAccessible(true);
+ exempt.setAccessible(true);
+ PermissionCollection defPerms = (PermissionCollection) def.invoke(null);
+ PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null);
+ Class<?> apCls = Class.forName("javax.crypto.CryptoAllPermission");
+ Field apField = apCls.getDeclaredField("INSTANCE");
+ apField.setAccessible(true);
+ Permission allPerms = (Permission) apField.get(null);
+ if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms)))
+ {
+ System.err.println("Running with the unlimited policy.");
+ System.exit(0);
+ }
+ else
+ {
+ System.err.println("WARNING: Running with a restricted crypto policy.");
+ System.exit(-1);
+ }
+ }
+}
diff -r a9271fe74b8d -r 6d2ddb408564 tapset/hotspot_jni.stp.in
--- a/tapset/hotspot_jni.stp.in Tue Mar 03 00:15:26 2015 +0000
+++ b/tapset/hotspot_jni.stp.in Wed Mar 04 17:31:04 2015 +0000
@@ -3472,6 +3472,7 @@
/* hotspot.jni.GetBooleanField
* Get non-static jboolean field value.
+ * NEEDS: -XX:-UseFastJNIAccessors
*
* env - JNIEnv pointer.
* obj - jobject.
@@ -3490,6 +3491,7 @@
More information about the distro-pkg-dev
mailing list