summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-01-08 18:44:48 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-01-08 18:44:48 (GMT)
commit59ab02a6c539a117bab93d9ed644dc6ff8d11a98 (patch)
treeaa835ed4e74da0cd3e5bb62243233fc29e90cb71
parentc3ae64a8753e6449a8c5c5e58325f0cb7e7990b6 (diff)
downloadhdf5-59ab02a6c539a117bab93d9ed644dc6ff8d11a98.zip
hdf5-59ab02a6c539a117bab93d9ed644dc6ff8d11a98.tar.gz
hdf5-59ab02a6c539a117bab93d9ed644dc6ff8d11a98.tar.bz2
HDFFV-10995 adjust testing to tolerate non-US locale
-rw-r--r--java/examples/datatypes/H5Ex_T_Float.java2
-rw-r--r--java/examples/datatypes/H5Ex_T_FloatAttribute.java2
-rw-r--r--java/test/junit.sh.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/java/examples/datatypes/H5Ex_T_Float.java b/java/examples/datatypes/H5Ex_T_Float.java
index f677479..caad74c 100644
--- a/java/examples/datatypes/H5Ex_T_Float.java
+++ b/java/examples/datatypes/H5Ex_T_Float.java
@@ -173,7 +173,7 @@ public class H5Ex_T_Float {
}
// Output the data to the screen.
- DecimalFormat df = new DecimalFormat("#,##0.0000");
+ DecimalFormat df = new DecimalFormat("#,##0.0000", new DecimalFormatSymbols(Locale.US));
System.out.println(DATASETNAME + ":");
for (int indx = 0; indx < dims[0]; indx++) {
System.out.print(" [");
diff --git a/java/examples/datatypes/H5Ex_T_FloatAttribute.java b/java/examples/datatypes/H5Ex_T_FloatAttribute.java
index 2e706d9..1243480 100644
--- a/java/examples/datatypes/H5Ex_T_FloatAttribute.java
+++ b/java/examples/datatypes/H5Ex_T_FloatAttribute.java
@@ -201,7 +201,7 @@ public class H5Ex_T_FloatAttribute {
}
// Output the data to the screen.
- DecimalFormat df = new DecimalFormat("#,##0.0000");
+ DecimalFormat df = new DecimalFormat("#,##0.0000", new DecimalFormatSymbols(Locale.US));
System.out.println(ATTRIBUTENAME + ":");
for (int indx = 0; indx < dims[0]; indx++) {
System.out.print(" [");
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index ac09db7..91b99a9 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -330,7 +330,7 @@ TESTING JUnit-TestH5
# Extract file name, line number, version and thread IDs because they may be different
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
-e 's/line [0-9]*/line (number)/' \
- -e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
+ -e 's/Time: [0-9]*[\.,[0-9]*]*/Time: XXXX/' \
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
JUnit-TestH5.ext > JUnit-TestH5.out