stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005962: TEST_BUG: java/util/Properties/MacJNUEncoding can fail in certain environments

Browse Source 
Test script now sets LC_ALL, other small changes, relocate test

Reviewed-by: naoto, alanb
This commit is contained in:
Brent Christian 2013-01-10 10:21:44 -08:00
parent f2c492220c
commit f7eb6cd556
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/test/java/util/Properties/MacJNUEncoding/ExpectedEncoding.java → jdk/test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java
View File

@ -31,6 +31,7 @@ public class ExpectedEncoding {
if (args.length != 2) {
System.out.println("Usage:");
System.out.println("$ java ExpectedEncoding <expected file.encoding> <expected sun.jnu.encoding>");
System.exit(1);
}
String expectFileEnc = args[0];
String expectSunJnuEnc = args[1];
@ -49,8 +50,7 @@ public class ExpectedEncoding {
failed = true;
}
if (failed) {
System.err.println("Test Failed");
System.exit(1);
throw new RuntimeException("Test Failed");
}
}
}

14
jdk/test/java/util/Properties/MacJNUEncoding/MacJNUEncoding.sh → jdk/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh
View File

@ -63,14 +63,16 @@ echo "Building test classes..."
"$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
echo ""
echo "Running test for LANG=C"
echo "Running test for C locale"
export LANG=C
export LC_ALL=C
"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
result1=$?
echo ""
echo "Running test for LANG=en_US.UTF-8"
echo "Running test for en_US.UTF-8 locale"
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
result2=$?
@ -79,11 +81,15 @@ echo "Cleanup"
rm ${TESTCLASSES}/ExpectedEncoding.class
if [ ${result1} -ne 0 ] ; then
echo "Test failed for LANG=C"
echo "Test failed for C locale"
echo " LANG=\"${LANG}\""
echo " LC_ALL=\"${LC_ALL}\""
exit ${result1}
fi
if [ ${result2} -ne 0 ] ; then
echo "Test failed for LANG=en_US.UTF-8"
echo "Test failed for en_US.UTF-8 locale"
echo " LANG=\"${LANG}\""
echo " LC_ALL=\"${LC_ALL}\""
exit ${result2}
fi
exit 0