/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Mar 1 13:29:34 UTC 2019
changeset bb0920379eac in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb0920379eac
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 01 14:28:19 2019 +0100
Silenced cygpath calls (Michal Vala)
changeset bfb5802f9c16 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bfb5802f9c16
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 01 14:29:09 2019 +0100
All custoom reprodcuers get tmp dir created correctly via cygpath on windows (Michal Vala)
diffstat:
Makefile.am | 8 ++++----
tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile | 6 +++++-
tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile | 6 +++++-
tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile | 6 +++++-
tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile | 6 +++++-
tests/reproducers/custom/JavaFx/srcs/Makefile | 6 +++++-
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile | 6 +++++-
tests/reproducers/custom/MixedSigningApplet/srcs/Makefile | 6 +++++-
tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile | 6 +++++-
tests/reproducers/custom/NoClassDeff/srcs/Makefile | 6 +++++-
tests/reproducers/custom/PackGZip/srcs/Makefile | 6 +++++-
tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile | 6 +++++-
tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile | 6 +++++-
tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile | 6 +++++-
tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile | 6 +++++-
15 files changed, 74 insertions(+), 18 deletions(-)
diffs (263 lines):
diff -r e53bdf5bdf98 -r bfb5802f9c16 Makefile.am
--- a/Makefile.am Fri Mar 01 12:09:07 2019 +0100
+++ b/Makefile.am Fri Mar 01 14:29:09 2019 +0100
@@ -1274,7 +1274,7 @@
then \
export TMP_MANIFEST=`mktemp` ; \
echo "$$AN $$dir" > $$TMP_MANIFEST ; \
- if which cygpath ; then \
+ if which cygpath &> /dev/null ; then \
export TMP_MANIFEST=$$(cygpath -p -m "$$TMP_MANIFEST") ; \
fi ; \
$(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$TMP_MANIFEST ; \
@@ -1345,7 +1345,7 @@
PUBLIC_KEYSTORE=${HOME}/.config ; \
fi ;\
export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
- if which cygpath ; then \
+ if which cygpath &> /dev/null ; then \
export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
fi ; \
keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
@@ -1367,7 +1367,7 @@
PUBLIC_KEYSTORE=${HOME}/.config ; \
fi ;\
export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
- if which cygpath ; then \
+ if which cygpath &> /dev/null ; then \
export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
fi ; \
keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
@@ -1385,7 +1385,7 @@
PUBLIC_KEYSTORE=${HOME}/.config ; \
fi ;\
export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
- if which cygpath ; then \
+ if which cygpath &> /dev/null ; then \
export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
fi ; \
keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile
--- a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile
--- a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile
--- a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/JavaFx/srcs/Makefile
--- a/tests/reproducers/custom/JavaFx/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile Fri Mar 01 12:09:07 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) ; \
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/MixedSigningApplet/srcs/Makefile
--- a/tests/reproducers/custom/MixedSigningApplet/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile
--- a/tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/NoClassDeff/srcs/Makefile
--- a/tests/reproducers/custom/NoClassDeff/srcs/Makefile Fri Mar 01 12:09:07 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);
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/PackGZip/srcs/Makefile
--- a/tests/reproducers/custom/PackGZip/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile
--- a/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile
--- a/tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile
--- a/tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile Fri Mar 01 12:09:07 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)
diff -r e53bdf5bdf98 -r bfb5802f9c16 tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile
--- a/tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile Fri Mar 01 12:09:07 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)
More information about the distro-pkg-dev
mailing list