Mercurial > hg > release > icedtea-web-1.8

changeset 1579:bfb5802f9c16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
All custoom reprodcuers get tmp dir created correctly via cygpath on windows (Michal Vala)
author Jiri Vanek <jvanek@redhat.com>
date Fri, 01 Mar 2019 14:29:09 +0100
parents bb0920379eac
children 0ab5d5c392c8
files tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile tests/reproducers/custom/JavaFx/srcs/Makefile tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile tests/reproducers/custom/MixedSigningApplet/srcs/Makefile tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile tests/reproducers/custom/NoClassDeff/srcs/Makefile tests/reproducers/custom/PackGZip/srcs/Makefile tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile
diffstat 14 files changed, 70 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -19,7 +19,11 @@
 MAINCLASS_JAR_UNSIGNED=LoadedViaMetaInfIndexListUnsigned.jar
 MAINCLASS_JAR_SIGNED=LoadedViaMetaInfIndexListSigned.jar
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer: 
 	echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR)
--- a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -8,7 +8,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR)
--- a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -8,7 +8,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -8,7 +8,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/JavaFx/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/JavaFx/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -5,7 +5,11 @@
 JAR=$(EXPORTED_JAR)
 JARSIGNER=$(EXPORTED_JARSIGNER)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -29,7 +29,11 @@
 MUNSIGNED3=$(TESTNAME)SecondUnsignedManifest.jar
 
 MANIFEST=MANIFEST.MF
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME) ; \
--- a/tests/reproducers/custom/MixedSigningApplet/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/MixedSigningApplet/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -9,7 +9,11 @@
 JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -9,7 +9,11 @@
 
 # Index jar causes main class jar to load
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer: 
 	echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR)
--- a/tests/reproducers/custom/NoClassDeff/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/NoClassDeff/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -7,7 +7,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME);
--- a/tests/reproducers/custom/PackGZip/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/PackGZip/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -6,7 +6,11 @@
 JARSIGNER=$(EXPORTED_JARSIGNER)
 PACKER=$(EXPORTED_PACK200)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -9,7 +9,11 @@
 JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -8,7 +8,11 @@
 JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer:
 	echo PREPARING REPRODUCER $(TESTNAME)
--- a/tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -4,7 +4,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer: 
 	echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR)
--- a/tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile	Fri Mar 01 14:28:19 2019 +0100
+++ b/tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile	Fri Mar 01 14:29:09 2019 +0100
@@ -4,7 +4,11 @@
 JAVAC=$(EXPORTED_JAVAC)
 JAR=$(EXPORTED_JAR)
 
-TMPDIR:=$(shell mktemp -d)
+ifeq ($(OS), Windows_NT)
+	TMPDIR:=$(shell cygpath -p -m $(shell mktemp -d))
+else
+	TMPDIR:=$(shell mktemp -d)
+endif
 
 prepare-reproducer: 
 	echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR)