From 4f48c9c5552c9c11347480de48d98eeae32b6546 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Tue, 27 Jan 2009 10:42:42 -0500 Subject: [svn-r16359] merge 16348 bug fix a new line was not inserted at the end of output, causing diff to complain between linux and frebsd tested: linux (freebsd tested on the trunk) --- tools/h5diff/testfiles/h5diff_203.txt | 2 +- tools/h5diff/testfiles/h5diff_204.txt | 2 +- tools/h5diff/testfiles/h5diff_205.txt | 3 ++- tools/lib/h5diff_dset.c | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/h5diff/testfiles/h5diff_203.txt b/tools/h5diff/testfiles/h5diff_203.txt index ee87879..aea1891 100644 --- a/tools/h5diff/testfiles/h5diff_203.txt +++ b/tools/h5diff/testfiles/h5diff_203.txt @@ -1,2 +1,2 @@ has rank 1, dimensions [6], max dimensions [6] - has rank 2, dimensions [3x2], max dimensions [3x2] \ No newline at end of file + has rank 2, dimensions [3x2], max dimensions [3x2] diff --git a/tools/h5diff/testfiles/h5diff_204.txt b/tools/h5diff/testfiles/h5diff_204.txt index 8dcb2ce..66b9e63 100644 --- a/tools/h5diff/testfiles/h5diff_204.txt +++ b/tools/h5diff/testfiles/h5diff_204.txt @@ -1,2 +1,2 @@ has rank 2, dimensions [3x2], max dimensions [3x2] - has rank 2, dimensions [2x2], max dimensions [2x2] \ No newline at end of file + has rank 2, dimensions [2x2], max dimensions [2x2] diff --git a/tools/h5diff/testfiles/h5diff_205.txt b/tools/h5diff/testfiles/h5diff_205.txt index a934e7c..f7360ab 100644 --- a/tools/h5diff/testfiles/h5diff_205.txt +++ b/tools/h5diff/testfiles/h5diff_205.txt @@ -1,2 +1,3 @@ has rank 2, dimensions [2x2], max dimensions [2x2] - has rank 2, dimensions [3x2], max dimensions [3x2] has sign H5T_SGN_2 and has sign H5T_SGN_NONE + has rank 2, dimensions [3x2], max dimensions [3x2] + has sign H5T_SGN_2 and has sign H5T_SGN_NONE diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index d36c65c..1a5778a 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -776,6 +776,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ print_dimensions(rank2,dims2); parallel_print(", max dimensions "); print_dimensions(rank2,maxdim2); + parallel_print("\n"); } can_compare = 0; @@ -820,6 +821,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ print_dimensions(rank2,dims2); parallel_print(", max dimensions "); print_dimensions(rank2,maxdim2); + parallel_print("\n"); } } -- cgit v0.12