/hg/icedtea-web: EXPORTED_TEST_CERT_SUFIX repalced by EXPORTED_T...

[jvanek at icedtea.classpath.org]

changeset d302c51bd619 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d302c51bd619
author: Jiri Vanek <jvanek at redhat.com>
date: Wed May 30 13:36:41 2012 +0200

	EXPORTED_TEST_CERT_SUFIX repalced by EXPORTED_TEST_CERT_SUFFIX


diffstat:

 ChangeLog   |  2 +-
 Makefile.am |  8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 017d474ea1e5 -r d302c51bd619 ChangeLog
--- a/ChangeLog	Wed May 30 12:31:19 2012 +0200
+++ b/ChangeLog	Wed May 30 13:36:41 2012 +0200
@@ -2,7 +2,7 @@
 
 	Enabled multiple certificates and extracted variables
 	* Makefile.am: EXPORTED_TEST_CERT by EXPORTED_TEST_CERT_PREFIX and 
-	EXPORTED_TEST_CERT_SUFIX for further composition
+	EXPORTED_TEST_CERT_SUFFIX for further composition
 	SIGNED_REPRODUCERS new variable for  iterating through signed reproducers
 	SIMPLE_REPRODUCERS new variable for  iterating through simple reproducers
 	ALL_REPRODUCER new variable for  iterating through all reproducers
diff -r 017d474ea1e5 -r d302c51bd619 Makefile.am
--- a/Makefile.am	Wed May 30 12:31:19 2012 +0200
+++ b/Makefile.am	Wed May 30 13:36:41 2012 +0200
@@ -25,7 +25,7 @@
 PRIVATE_KEYSTORE_NAME=teststore.ks
 PRIVATE_KEYSTORE_PASS=123456789
 EXPORTED_TEST_CERT_PREFIX=icedteatests
-EXPORTED_TEST_CERT_SUFIX=crt
+EXPORTED_TEST_CERT_SUFFIX=crt
 TEST_CERT_ALIAS=icedteaweb
 PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
 PUBLIC_KEYSTORE_PASS=changeit
@@ -596,7 +596,7 @@
 stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp netx-dist-tests-remove-cert-from-public
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
-	  keytool -export -alias $(TEST_CERT_ALIAS)_$$which -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFIX) -storepass $(PRIVATE_KEYSTORE_PASS) -keystore $(PRIVATE_KEYSTORE_NAME) ; \
+	  keytool -export -alias $(TEST_CERT_ALIAS)_$$which -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) -storepass $(PRIVATE_KEYSTORE_PASS) -keystore $(PRIVATE_KEYSTORE_NAME) ; \
 	done ;
 	mkdir -p stamps && \
 	touch $@
@@ -604,7 +604,7 @@
 stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
-	  yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFIX) ;\
+	  yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
 	done ;
 	mkdir -p stamps && \
 	touch $@
@@ -1033,7 +1033,7 @@
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
 	  rm -f junit-jnlp-dist-$$which.txt ; \
-	  rm -f $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFIX) ; \
+	  rm -f $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ; \
 	done ;
 	rm -f stamps/exported-test-certs.stamp
 	rm -f stamps/junit-jnlp-dist-signed.stamp