diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2007-06-20 18:34:11 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2007-06-20 18:34:11 (GMT) |
| commit | 4965da5a72d38548cd482f73d3b62e0d133730af (patch) | |
| tree | a02269e9e31b04c7c9e16547536af0cc284b38b1 | |
| parent | 2bdd81b3a2a26d35a4d8c386478ca632df6dfe30 (diff) | |
| download | hdf5-4965da5a72d38548cd482f73d3b62e0d133730af.zip hdf5-4965da5a72d38548cd482f73d3b62e0d133730af.tar.gz hdf5-4965da5a72d38548cd482f73d3b62e0d133730af.tar.bz2 | |
[svn-r13894] Description:
On Windows, Mingw interprets all parameters starting with '/' as paths, and replaces the '/' with its home directory, "C:\Windows\msys\". This was a problem in h5diff tests such as:
h5diff h5diff_101.txt $FILE1 $FILE1 /g1/d1 g1/d2 -v
I've removed the leading '/', as h5diff will interpret it the same either way.
Tested:
kagiso, linew, and smirom, via h5committest
mingw on Windows XP
| -rwxr-xr-x | tools/h5diff/testh5diff.sh | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_101.txt | 2 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_102.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index a44a4c1..264cb4d 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -498,8 +498,8 @@ TOOLTEST h5diff_90.txt $FILE1 $FILE1 TOOLTEST h5diff_100.txt $FILE9 $FILE10 -v # 11. floating point comparison -TOOLTEST h5diff_101.txt $FILE1 $FILE1 /g1/d1 g1/d2 -v -TOOLTEST h5diff_102.txt $FILE1 $FILE1 /g1/fp1 g1/fp2 -v +TOOLTEST h5diff_101.txt $FILE1 $FILE1 g1/d1 g1/d2 -v +TOOLTEST h5diff_102.txt $FILE1 $FILE1 g1/fp1 g1/fp2 -v # ############################################################################## # # END diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt index 89a4bd2..e7c3d82 100644 --- a/tools/testfiles/h5diff_101.txt +++ b/tools/testfiles/h5diff_101.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v' +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2 -v' ############################# dataset: </g1/d1> and </g1/d2> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt index 6d32ff3..475090c 100644 --- a/tools/testfiles/h5diff_102.txt +++ b/tools/testfiles/h5diff_102.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v' +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2 -v' ############################# dataset: </g1/fp1> and </g1/fp2> size: [3x2] [3x2] |