8055675: java/util/Currency/PropertiesTest.sh fails on OS X after JDK-8055253
authormartin
Wed, 20 Aug 2014 11:06:38 -0700
changeset 26189 1868b96bbc6e
parent 26041 ca1b8bdbe663
child 26190 d183677673d9
8055675: java/util/Currency/PropertiesTest.sh fails on OS X after JDK-8055253 Summary: Replace obsolescent cp -r with cp -R. Add more error checks. Reviewed-by: naoto
jdk/test/java/util/Currency/PropertiesTest.sh
--- a/jdk/test/java/util/Currency/PropertiesTest.sh	Wed Aug 20 16:10:13 2014 +0200
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh	Wed Aug 20 11:06:38 2014 -0700
@@ -100,14 +100,14 @@
 # Make a private copy of the jdk so we can write to the properties file location
 # without disturbing other users, including concurrently executing tests.
 WRITABLEJDK=.${FS}testjava
-cp -Hr $TESTJAVA $WRITABLEJDK
+cp -H -R $TESTJAVA $WRITABLEJDK || exit 1
 if [ -d ${TESTJAVA}${FS}jre ]; then
   PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
 else
   PROPLOCATION=${WRITABLEJDK}${FS}lib
 fi
-chmod -R +w $WRITABLEJDK
-cp ${PROPS} $PROPLOCATION
+chmod -R +w $WRITABLEJDK || exit 1
+cp ${PROPS} $PROPLOCATION || exit 1
 echo "Properties location: ${PROPLOCATION}"
 
 # run