summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2001-08-14 17:28:14 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2001-08-14 17:28:14 (GMT)
commitc47f724187d516f9b7cd8c9e313f3e6dc7577530 (patch)
treecdd16288c90047b7a9bc2cf51158f88147d54846
parentba1e23c18da2253bb63fb147179dd15f142617b4 (diff)
downloadhdf5-c47f724187d516f9b7cd8c9e313f3e6dc7577530.zip
hdf5-c47f724187d516f9b7cd8c9e313f3e6dc7577530.tar.gz
hdf5-c47f724187d516f9b7cd8c9e313f3e6dc7577530.tar.bz2
[svn-r4345] Purpose:
Improvement Description: The stdout and stderr were both redirected to an output file. This works fine in tradition sequential Unix machines. But in some parallel systems (like mpi-jobs in IBM SP), the stderr is merged with stdout alright but not in the exact order as expected. This is not deterministic in parallel jobs. So, the test output are all there but the ordering maynot be as expected. Solution: Redirect stderr to separated file and append it to the stdout file after test-command is executed. Then compare it with the expected output. This eliminate the assumption that stdout and stderr must merged in "chronical orders". The .ddl file are updated by moving all stderr text to the end of the file. Platforms tested: eirene.
-rw-r--r--tools/testfiles/tattr-3.ddl4
-rw-r--r--tools/testfiles/tcomp-3.ddl4
-rw-r--r--tools/testfiles/tdset-2.ddl4
-rw-r--r--tools/testfiles/tgroup-2.ddl4
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index 4e0bea3..d0e1bba 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -7,6 +7,6 @@ ATTRIBUTE "/attr2" {
DATASPACE SIMPLE { ( 10 ) / ( 10 ) }
}
ATTRIBUTE "/attr" {
- h5dump error: unable to open attribute "/"
-}
+ }
}
+h5dump error: unable to open attribute "/"
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl
index c4f674f..9977b2b 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/testfiles/tcomp-3.ddl
@@ -3,8 +3,7 @@ Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5'
#############################
HDF5 "tcompound.h5" {
DATATYPE "/#5992:0"
- h5dump error: unable to open datatype "/#5992:0"
-
+
GROUP "/group2" {
DATASET "dset5" {
DATATYPE "/#6632:0"
@@ -35,3 +34,4 @@ GROUP "/group2" {
}
}
}
+h5dump error: unable to open datatype "/#5992:0"
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 30dfec6..8584e2f 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -11,6 +11,6 @@ DATASET "/dset2" {
DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
}
DATASET "dset3" {
- h5dump error: unable to open dataset "dset3"
-}
+ }
}
+h5dump error: unable to open dataset "dset3"
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl
index a0d0ab7..f1675bc 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/testfiles/tgroup-2.ddl
@@ -41,6 +41,6 @@ GROUP "/" {
}
}
GROUP "/y" {
- h5dump error: unable to open group "/y"
-}
+ }
}
+h5dump error: unable to open group "/y"