/hg/release/icedtea-web-1.3: 6 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed Nov 7 10:07:35 PST 2012
changeset e7970f3da5fe in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=e7970f3da5fe
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Nov 01 11:50:47 2012 -0400
CVE-2012-4540, RH869040: Heap-based buffer overflow after triggering event attached to applet
changeset fe5f7088f30b in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=fe5f7088f30b
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Nov 01 12:21:19 2012 -0400
Added NEWS entry for PR1161
changeset 89d481ff6266 in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=89d481ff6266
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Nov 01 12:22:53 2012 -0400
Prepare for 1.3.1
changeset 085acbc2a34c in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=085acbc2a34c
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Nov 01 12:25:01 2012 -0400
Added tag icedtea-web-1.3.1 for changeset 89d481ff6266
changeset fa508a6abb25 in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=fa508a6abb25
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Nov 01 12:25:16 2012 -0400
Prepare for 1.3.2
changeset b8bd24f0aad1 in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=b8bd24f0aad1
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Nov 07 13:06:52 2012 -0500
Merge
diffstat:
.hgtags | 1 +
ChangeLog | 40 ++
Makefile.am | 187 +++++----
NEWS | 8 +-
configure.ac | 2 +-
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 18 +-
tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile | 4 +-
tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile | 6 +-
8 files changed, 153 insertions(+), 113 deletions(-)
diffs (truncated from 587 to 500 lines):
diff -r 11c61503e614 -r b8bd24f0aad1 .hgtags
--- a/.hgtags Mon Sep 17 16:40:25 2012 -0400
+++ b/.hgtags Wed Nov 07 13:06:52 2012 -0500
@@ -2,3 +2,4 @@
b605505179459c9f2119e4dfde999fc6300e4c87 icedtea-web-1.1-branchpoint
41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint
03ac5dc76069aac927946ccc26698f52e1965260 icedtea-web-1.3
+89d481ff6266fdd80f65afeb41b22f23e8371350 icedtea-web-1.3.1
diff -r 11c61503e614 -r b8bd24f0aad1 ChangeLog
--- a/ChangeLog Mon Sep 17 16:40:25 2012 -0400
+++ b/ChangeLog Wed Nov 07 13:06:52 2012 -0500
@@ -1,3 +1,43 @@
+2012-11-02 Jiri Vanek <jvanek at redhat.com>
+
+ Renamed reproducers-related variables and targets
+ * Makefile.am:
+ NETX_TEST_DIR - new parent directory variable for tests
+ NETX_UNIT_TEST_DIR - is now using this variable
+ JNLP_TESTS_ENGINE_SRCDIR -> TEST_EXTENSIONS_SRCDIR
+ JNLP_TESTS_ENGINE_TESTS_SRCDIR -> TEST_EXTENSIONS_TESTS_SRCDIR
+ JNLP_TESTS_SRCDIR -> REPRODUCERS_TESTS_SRCDIR
+ JNLP_TESTS_ENGINE_DIR -> TEST_EXTENSIONS_DIR
+ JNLP_TESTS_ENGINE_TESTS_DIR -> TEST_EXTENSIONS_TESTS_DIR
+ new variable TEST_EXTENSIONS_COMPATIBILITY_SYMLINK still pointing to $(TESTS_DIR)/netx/jnlp_testsengine
+ $(TESTS_DIR)/jnlp_testsengine now points to $(TESTS_DIR)/test-extensions
+ JNLP_TESTS_SERVER_DEPLOYDIR -> REPRODUCERS_TESTS_SERVER_DEPLOYDIR
+ JNLP_TESTS_DIR -> REPRODUCERS_BUILD_DIR
+ netx-dist-tests-source-files.txt -> test-extensions-source-files.txt
+ stamps/netx-dist-tests-compile.stamp -> stamps/test-extensions-compile.stamp
+ stamps/netx-dist-tests-tests-compile.stamp -> stamps/test-extensions-tests-compile.stamp
+ stamps/netx-dist-tests-compile-testcases.stamp -> stamps/compile-reproducers-testcases.stamp
+ stamps/netx-dist-tests-copy-resources.stamp -> stamps/copy-reproducers-resources.stamp
+ * tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile: and
+ * tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile: following above renaming
+
+2012-11-01 Deepak Bhole <dbhole at redhat.com>
+
+ * configure.ac: Prepare for 1.3.2
+ * NEWS: Same
+
+2012-11-01 Deepak Bhole <dbhole at redhat.com>
+
+ * configure.ac: Prepare for 1.3.1
+ * NEWS: Same
+
+2012-11-01 Deepak Bhole <dbhole at redhat.com>
+
+ CVE-2012-4540, RH869040: Heap-based buffer overflow after triggering event
+ attached to applet
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Removed unnecessary
+ heap allocations.
+
2012-09-17 Deepak Bhole <dbhole at redhat.com>
PR1161: X509VariableTrustManager does not work correctly with OpenJDK7
diff -r 11c61503e614 -r b8bd24f0aad1 Makefile.am
--- a/Makefile.am Mon Sep 17 16:40:25 2012 -0400
+++ b/Makefile.am Wed Nov 07 13:06:52 2012 -0500
@@ -12,19 +12,21 @@
export TESTS_DIR=$(abs_top_builddir)/tests.build
export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
-export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+export NETX_TEST_DIR=$(TESTS_DIR)/netx
+export NETX_UNIT_TEST_DIR=$(NETX_TEST_DIR)/unit
export JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
export JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
-export JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/test-extensions
-export JNLP_TESTS_ENGINE_TESTS_SRCDIR=$(TESTS_SRCDIR)/test-extensions-tests
-export JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/reproducers
-export JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/jnlp_testsengine
-export JNLP_TESTS_ENGINE_TESTS_DIR=$(TESTS_DIR)/netx/jnlp_testsengine_tests
-export JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
-export JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
+export TEST_EXTENSIONS_SRCDIR=$(TESTS_SRCDIR)/test-extensions
+export TEST_EXTENSIONS_TESTS_SRCDIR=$(TESTS_SRCDIR)/test-extensions-tests
+export REPRODUCERS_TESTS_SRCDIR=$(TESTS_SRCDIR)/reproducers
+export TEST_EXTENSIONS_DIR=$(TESTS_DIR)/test-extensions
+export TEST_EXTENSIONS_COMPATIBILITY_SYMLINK=$(TESTS_DIR)/netx/jnlp_testsengine
+export TEST_EXTENSIONS_TESTS_DIR=$(TESTS_DIR)/test-extensions-tests
+export REPRODUCERS_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/reproducers_test_server_deploydir
+export REPRODUCERS_BUILD_DIR=$(TESTS_DIR)/reproducers.classes
export PRIVATE_KEYSTORE_NAME=teststore.ks
export PRIVATE_KEYSTORE_PASS=123456789
export EXPORTED_TEST_CERT_PREFIX=icedteatests
@@ -155,7 +157,7 @@
itweb-settings.desktop.in $(top_srcdir)/tests
# reproducers `D`shortcuts
-export DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
export DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
export REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
@@ -501,31 +503,31 @@
junit-runner-source-files.txt:
find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
-$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/netx-dist-tests-compile.stamp
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/test-extensions-compile.stamp
mkdir -p $(JUNIT_RUNNER_DIR) && \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(JUNIT_RUNNER_DIR) \
- -classpath $(JUNIT_JAR):$(JNLP_TESTS_ENGINE_DIR) \
+ -classpath $(JUNIT_JAR):$(TEST_EXTENSIONS_DIR) \
@junit-runner-source-files.txt && \
$(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) .
stamps/junit-jnlp-dist-dirs: junit-jnlp-dist-simple.txt stamps/junit-jnlp-dist-signed.stamp junit-jnlp-dist-custom.txt
- mkdir -p $(JNLP_TESTS_SERVER_DEPLOYDIR)
- mkdir -p $(JNLP_TESTS_DIR)
+ mkdir -p $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
+ mkdir -p $(REPRODUCERS_BUILD_DIR)
touch $@
junit-jnlp-dist-custom.txt:
- cd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
+ cd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
junit-jnlp-dist-simple.txt:
- cd $(JNLP_TESTS_SRCDIR)/simple/ ; \
+ cd $(REPRODUCERS_TESTS_SRCDIR)/simple/ ; \
find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
stamps/junit-jnlp-dist-signed.stamp:
types=($(SIGNED_REPRODUCERS)) ; \
for which in "$${types[@]}" ; do \
- pushd $(JNLP_TESTS_SRCDIR)/$$which/ ; \
+ pushd $(REPRODUCERS_TESTS_SRCDIR)/$$which/ ; \
find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
popd ; \
done ; \
@@ -540,22 +542,22 @@
IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
echo "processing: $$dir" ; \
- mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
- if [ -e "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
+ mkdir -p "$(REPRODUCERS_BUILD_DIR)/$$dir" ; \
+ if [ -e "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
d=`pwd` ; \
- cd "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
+ cd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
srcFiles=`find . -mindepth 1 -type f -name "*.java" | sed "s/.\/*//"` ; \
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
- $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
+ $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
+ cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
fi ; \
- cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+ cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
if [ -f $(META_MANIFEST) ]; \
then \
- $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
+ $(BOOT_DIR)/bin/jar cfm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
else \
- $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+ $(BOOT_DIR)/bin/jar cf "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
fi; \
cd "$$d" ; \
fi; \
@@ -574,14 +576,14 @@
signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
IFS="$$IFS_BACKUP" ; \
for dir in "$${signedReproducers[@]}" ; do \
- $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS) "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$tcaw ; \
+ $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS) "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$tcaw ; \
done ; \
done ; \
mkdir -p stamps && \
touch $@
stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
- pushd $(JNLP_TESTS_SERVER_DEPLOYDIR); \
+ pushd $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
types=($(ALL_NONCUSTOM_REPRODUCERS)); \
for which in "$${types[@]}" ; do \
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
@@ -642,33 +644,34 @@
done ;
-rm -rf stamps/netx-dist-tests-import-cert-to-public
-netx-dist-tests-source-files.txt:
- find $(JNLP_TESTS_ENGINE_SRCDIR) -name '*.java' | sort > $@
+test-extensions-source-files.txt:
+ find $(TEST_EXTENSIONS_SRCDIR) -name '*.java' | sort > $@
-stamps/netx-dist-tests-compile.stamp: stamps/netx.stamp \
- stamps/junit-jnlp-dist-dirs netx-dist-tests-source-files.txt
- mkdir -p $(JNLP_TESTS_ENGINE_DIR);
+stamps/test-extensions-compile.stamp: stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt
+ mkdir -p $(TEST_EXTENSIONS_DIR);
+ mkdir -p $(NETX_TEST_DIR);
+ ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK);
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(JNLP_TESTS_ENGINE_DIR) \
+ -d $(TEST_EXTENSIONS_DIR) \
-classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
- @netx-dist-tests-source-files.txt && \
+ @test-extensions-source-files.txt && \
mkdir -p stamps && \
touch $@
-netx-dist-tests-tests-source-files.txt:
- find $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) -name '*.java' | sort > $@
+test-extensions-tests-source-files.txt:
+ find $(TEST_EXTENSIONS_TESTS_SRCDIR) -name '*.java' | sort > $@
-stamps/netx-dist-tests-tests-compile.stamp: stamps/junit-jnlp-dist-dirs netx-dist-tests-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
- mkdir -p $(JNLP_TESTS_ENGINE_TESTS_DIR);
+stamps/test-extensions-tests-compile.stamp: stamps/junit-jnlp-dist-dirs test-extensions-tests-source-files.txt stamps/test-extensions-compile.stamp
+ mkdir -p $(TEST_EXTENSIONS_TESTS_DIR);
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(JNLP_TESTS_ENGINE_TESTS_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
- @netx-dist-tests-tests-source-files.txt && \
+ -d $(TEST_EXTENSIONS_TESTS_DIR) \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
+ @test-extensions-tests-source-files.txt && \
mkdir -p stamps && \
touch $@
-stamps/netx-dist-tests-compile-testcases.stamp: stamps/netx.stamp stamps/junit-jnlp-dist-dirs \
- netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-tests-compile.stamp
+stamps/compile-reproducers-testcases.stamp: stamps/netx.stamp stamps/junit-jnlp-dist-dirs \
+ test-extensions-source-files.txt stamps/test-extensions-compile.stamp stamps/test-extensions-tests-compile.stamp
types=($(ALL_REPRODUCERS)); \
for which in "$${types[@]}" ; do \
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
@@ -676,22 +679,22 @@
IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(JNLP_TESTS_ENGINE_TESTS_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
- "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
+ -d $(TEST_EXTENSIONS_TESTS_DIR) \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
+ "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
done ; \
done ; \
mkdir -p stamps && \
touch $@
-stamps/netx-dist-tests-copy-resources.stamp: stamps/junit-jnlp-dist-dirs
+stamps/copy-reproducers-resources.stamp: stamps/junit-jnlp-dist-dirs
types=($(ALL_REPRODUCERS)); \
for which in "$${types[@]}" ; do \
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
- cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"* $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+ cp -R "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/resources/"* $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/ ; \
done ; \
done ; \
mkdir -p stamps && \
@@ -699,7 +702,7 @@
$(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
- cd $(JNLP_TESTS_ENGINE_TESTS_DIR) ; \
+ cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
class_names= ; \
for test in `find -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
@@ -724,27 +727,27 @@
stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
- stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
- cd $(JNLP_TESTS_ENGINE_DIR) ; \
+ cd $(TEST_EXTENSIONS_DIR) ; \
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
- CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(JNLP_TESTS_ENGINE_TESTS_DIR) \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
$(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
-Xbootclasspath:$(RUNTIME) CommandLine $$class_names
if WITH_XSLTPROC
- $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(JNLP_TESTS_ENGINE_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
- $(XSLTPROC) --stringparam logs logs_reproducers.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html
+ $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(TEST_EXTENSIONS_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
+ $(XSLTPROC) --stringparam logs logs_reproducers.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(TEST_EXTENSIONS_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html
endif
touch $@
stamps/process-custom-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
- stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
IFS="$$IFS_BACKUP" ; \
for dir in "$${customReproducers[@]}" ; do \
- pushd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
+ pushd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
$(MAKE) prepare-reproducer ; \
popd ; \
done ; \
@@ -756,7 +759,7 @@
customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
IFS="$$IFS_BACKUP" ; \
for dir in "$${customReproducers[@]}" ; do \
- pushd $(JNLP_TESTS_SRCDIR)/custom/$$dir/srcs; \
+ pushd $(REPRODUCERS_TESTS_SRCDIR)/custom/$$dir/srcs; \
$(MAKE) clean-reproducer ; \
popd ; \
done ; \
@@ -872,11 +875,11 @@
find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
- netx-unit-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
+ netx-unit-tests-source-files.txt stamps/test-extensions-compile.stamp
mkdir -p $(NETX_UNIT_TEST_DIR) && \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_UNIT_TEST_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
@netx-unit-tests-source-files.txt && \
mkdir -p stamps && \
touch $@
@@ -906,7 +909,7 @@
done ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(JNLP_TESTS_ENGINE_DIR):. \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \
$(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
if WITH_XSLTPROC
$(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(NETX_UNIT_TEST_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_unit.html
@@ -941,7 +944,7 @@
-cp $(BOOT_DIR)/jre/lib/jsse.jar \
-cp $(BOOT_DIR)/jre/lib/resources.jar \
-cp $(RHINO_RUNTIME) \
- -cp $(JNLP_TESTS_ENGINE_DIR) \
+ -cp $(TEST_EXTENSIONS_DIR) \
-cp . \
-ix "-org.junit.*" \
-ix "-junit.*" \
@@ -962,7 +965,7 @@
if WITH_EMMA
cd $(TESTS_DIR) ; \
for file in $(EMMA_MODIFIED_FILES) ; do \
- mv $(JNLP_TESTS_ENGINE_DIR)/$$file $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+ mv $(TEST_EXTENSIONS_DIR)/$$file $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
done ;\
echo "backuping javaws and netx.jar in $(DESTDIR)" ; \
netx_backup=$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx_backup.jar ; \
@@ -990,11 +993,11 @@
for dir in "$${simpleReproducers[@]}" ; do \
testcases_srcs[k]="-sp" ; \
k=$$((k+1)) ; \
- testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+ testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
k=$$((k+1)) ; \
done ; \
done ; \
- cd $(JNLP_TESTS_ENGINE_DIR) ; \
+ cd $(TEST_EXTENSIONS_DIR) ; \
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
$(BOOT_DIR)/bin/java \
$(EMMA_JAVA_ARGS) \
@@ -1009,24 +1012,24 @@
-cp $(BOOT_DIR)/jre/lib/resources.jar \
-cp $(RHINO_RUNTIME) \
-cp . \
- -cp $(JNLP_TESTS_ENGINE_TESTS_DIR) \
+ -cp $(TEST_EXTENSIONS_TESTS_DIR) \
-ix "-org.junit.*" \
-ix "-junit.*" \
CommandLine $$class_names ; \
- mv $(JNLP_TESTS_ENGINE_DIR)/coverage.ec $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec ; \
- mv $(JNLP_TESTS_ENGINE_DIR)/coverage.es $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+ mv $(TEST_EXTENSIONS_DIR)/coverage.ec $(TEST_EXTENSIONS_DIR)/coverageX.ec ; \
+ mv $(TEST_EXTENSIONS_DIR)/coverage.es $(TEST_EXTENSIONS_DIR)/coverageX.es ; \
$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
-in $(TESTS_DIR)/coverage.em \
- -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec \
- -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+ -in $(TEST_EXTENSIONS_DIR)/coverageX.ec \
+ -in $(TEST_EXTENSIONS_DIR)/coverageX.es ; \
$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
-Dreport.html.out.encoding=UTF-8 \
- -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es \
+ -in $(TEST_EXTENSIONS_DIR)/coverage.es \
-sp $(NETX_SRCDIR) \
-sp $(NETX_UNIT_TEST_SRCDIR) \
-sp $(JUNIT_RUNNER_SRCDIR) \
- -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
- -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+ -sp $(TEST_EXTENSIONS_SRCDIR) \
+ -sp $(TEST_EXTENSIONS_TESTS_SRCDIR) \
-r html \
-r xml \
"$${testcases_srcs[@]}" ; \
@@ -1036,10 +1039,10 @@
mv $$javaws_backup $(DESTDIR)$(bindir)/$(javaws); \
mv $$netx_backup $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ; \
for file in $(EMMA_MODIFIED_FILES) ; do \
- mv $(JNLP_TESTS_ENGINE_DIR)/$$file $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
- mv $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" $(JNLP_TESTS_ENGINE_DIR)/$$file ; \
+ mv $(TEST_EXTENSIONS_DIR)/$$file $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+ mv $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" $(TEST_EXTENSIONS_DIR)/$$file ; \
done ;\
- rm $(JNLP_TESTS_ENGINE_DIR)/coverage.txt ;
+ rm $(TEST_EXTENSIONS_DIR)/coverage.txt ;
else
echo "Sorry, coverage report cant be run without emma installed. Try install emma or specify with-emma value" ;
exit 5
@@ -1058,13 +1061,13 @@
for dir in "$${simpleReproducers[@]}" ; do \
testcases_srcs[k]="-sp" ; \
k=$$((k+1)) ; \
- testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+ testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
k=$$((k+1)) ; \
done ; \
done ; \
$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
-in $(NETX_UNIT_TEST_DIR)/coverage.es \
- -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
+ -in $(TEST_EXTENSIONS_DIR)/coverage.es ; \
$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
-Dreport.html.out.encoding=UTF-8 \
-in $(TESTS_DIR)/coverage.es \
@@ -1072,8 +1075,8 @@
-sp $(NETX_SRCDIR) \
-sp $(NETX_UNIT_TEST_SRCDIR) \
-sp $(JUNIT_RUNNER_SRCDIR) \
- -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
- -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+ -sp $(TEST_EXTENSIONS_SRCDIR) \
+ -sp $(TEST_EXTENSIONS_TESTS_SRCDIR) \
"$${testcases_srcs[@]}" \
-r html \
-r xml ;
@@ -1105,17 +1108,19 @@
rm -f $(TESTS_DIR)/*.html
clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public clean-custom-reproducers
- rm -f netx-dist-tests-source-files.txt
- rm -rf $(JNLP_TESTS_ENGINE_TESTS_DIR)
- rm -rf $(JNLP_TESTS_DIR)
- rm -rf $(JNLP_TESTS_SERVER_DEPLOYDIR)
- rm -rf $(JNLP_TESTS_ENGINE_DIR)
+ rm -f test-extensions-source-files.txt
+ rm -f test-extensions-tests-source-files.txt
+ rm -f $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK)
+ rm -rf $(TEST_EXTENSIONS_TESTS_DIR)
+ rm -rf $(REPRODUCERS_BUILD_DIR)
+ rm -rf $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
+ rm -rf $(TEST_EXTENSIONS_DIR)
rm -f stamps/junit-jnlp-dist-dirs
- rm -f stamps/netx-dist-tests-compile.stamp
- rm -f stamps/netx-dist-tests-tests-compile.stamp
+ rm -f stamps/test-extensions-compile.stamp
+ rm -f stamps/test-extensions-tests-compile.stamp
rm -f stamps/netx-dist-tests-prepare-reproducers.stamp
- rm -f stamps/netx-dist-tests-compile-testcases.stamp
- rm -f stamps/netx-dist-tests-copy-resources.stamp
+ rm -f stamps/compile-reproducers-testcases.stamp
+ rm -f stamps/copy-reproducers-resources.stamp
rm -f stamps/netx-dist-tests-sign-some-reproducers.stamp
rm -f stamps/change-dots-to-paths.stamp
rm -f junit-jnlp-dist-simple.txt
@@ -1145,10 +1150,10 @@
clean-reproducers-test-code-coverage:
if [ -e stamps/run-reproducers-test-code-coverage.stamp ]; then \
- rm -rf $(JNLP_TESTS_ENGINE_DIR)/coverage ; \
- rm -f $(JNLP_TESTS_ENGINE_DIR)/coverage.xml ; \
- rm -f $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
- rm -f $(JNLP_TESTS_ENGINE_DIR)/tests-output_withEmma.xml ; \
+ rm -rf $(TEST_EXTENSIONS_DIR)/coverage ; \
+ rm -f $(TEST_EXTENSIONS_DIR)/coverage.xml ; \
+ rm -f $(TEST_EXTENSIONS_DIR)/coverage.es ; \
+ rm -f $(TEST_EXTENSIONS_DIR)/tests-output_withEmma.xml ; \
rm -f stamps/run-reproducers-test-code-coverage.stamp ; \
fi
diff -r 11c61503e614 -r b8bd24f0aad1 NEWS
--- a/NEWS Mon Sep 17 16:40:25 2012 -0400
+++ b/NEWS Wed Nov 07 13:06:52 2012 -0500
@@ -8,7 +8,13 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.3.1 (2012-XX-XX):
+New in release 1.3.2 (2012-XX-XX):
+
+New in release 1.3.1 (2012-11-07):
More information about the distro-pkg-dev
mailing list