From 5650be2d1a2cb514355706d0ccdfd43519244a0e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 23 Jan 2013 08:48:54 -0500
Subject: [svn-r23193] Rename ddl export file and force file write on copy for
 windows.

Tested: local linux
---
 MANIFEST                      |  2 +-
 tools/h5dump/CMakeLists.txt   |  4 +--
 tools/h5dump/testh5dump.sh.in |  6 ++---
 tools/testfiles/twithddl.ddl  | 58 -------------------------------------------
 tools/testfiles/twithddl.exp  | 58 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 tools/testfiles/twithddl.ddl
 create mode 100644 tools/testfiles/twithddl.exp

diff --git a/MANIFEST b/MANIFEST
index 93824d5..8384c2f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1585,7 +1585,7 @@
 ./tools/testfiles/tbigdims.h5
 ./tools/testfiles/thyperslab.h5
 ./tools/testfiles/twidedisplay.ddl
-./tools/testfiles/twithddl.ddl
+./tools/testfiles/twithddl.exp
 ./tools/testfiles/twithddlfile.ddl
 ./tools/testfiles/twithddlfile.exp
 
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 321b446..1d0012e 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -191,7 +191,6 @@ IF (BUILD_TESTING)
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/twidedisplay.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddl.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddlfile.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/h5dump-help.txt
       ${HDF5_TOOLS_SRC_DIR}/testfiles/out3.h5import
@@ -202,6 +201,7 @@ IF (BUILD_TESTING)
       trawdatafile.exp
       tstr2bin2.exp
       tstr2bin6.exp
+      twithddl.exp
       twithddlfile.exp
   )
   SET (HDF5_REFERENCE_TEST_FILES
@@ -1282,7 +1282,7 @@ IF (BUILD_TESTING)
   ADD_TEST (
       NAME H5DUMP-output-cmp-meta-twithddlfile
       COMMAND ${CMAKE_COMMAND}
-          -E compare_files twithddl.txt twithddl.ddl
+          -E compare_files twithddl.txt twithddl.exp
   )
   SET_TESTS_PROPERTIES (H5DUMP-output-cmp-meta-twithddlfile PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
   IF (NOT "${last_test}" STREQUAL "")
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 667908b..d3270d7 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -316,7 +316,7 @@ $SRC_H5DUMP_TESTFILES/tvldtypes5.ddl
 $SRC_H5DUMP_TESTFILES/tvlstr.ddl
 $SRC_H5DUMP_TESTFILES/tvms.ddl
 $SRC_H5DUMP_TESTFILES/twidedisplay.ddl
-$SRC_H5DUMP_TESTFILES/twithddl.ddl
+$SRC_H5DUMP_TESTFILES/twithddl.exp
 $SRC_H5DUMP_TESTFILES/twithddlfile.ddl
 $SRC_H5DUMP_TESTFILES/twithddlfile.exp
 $SRC_H5DUMP_TESTFILES/h5dump-help.txt
@@ -510,7 +510,7 @@ TOOLTEST2A() {
     actual_err="$TESTDIR/`basename $1 .exp`.err"
     shift
     expectmeta="$TESTDIR/$1"
-    actualmeta="$TESTDIR/`basename $1 .ddl`.txt"
+    actualmeta="$TESTDIR/`basename $1 .exp`.txt"
     shift
 
     # Run test.
@@ -805,7 +805,7 @@ TOOLTEST tnoattrddl.ddl --enable-error-stack --ddl=NULL -y tattr.h5
 TOOLTEST tnoattrdata.ddl --enable-error-stack -A --output=NULL tattr.h5
 TOOLTEST2 trawdatafile.exp --enable-error-stack -y -o trawdatafile.txt packedbits.h5
 TOOLTEST2 tnoddlfile.exp --enable-error-stack --ddl=NULL -y -o tnoddlfile.txt packedbits.h5
-TOOLTEST2A twithddlfile.exp twithddl.ddl --enable-error-stack --ddl=twithddl.txt -y -o twithddlfile.txt packedbits.h5
+TOOLTEST2A twithddlfile.exp twithddl.exp --enable-error-stack --ddl=twithddl.txt -y -o twithddlfile.txt packedbits.h5
 
 # test for maximum display datasets
 TOOLTEST twidedisplay.ddl --enable-error-stack -w0 packedbits.h5
diff --git a/tools/testfiles/twithddl.ddl b/tools/testfiles/twithddl.ddl
deleted file mode 100644
index f99d906..0000000
--- a/tools/testfiles/twithddl.ddl
+++ /dev/null
@@ -1,58 +0,0 @@
-HDF5 "packedbits.h5" {
-GROUP "/" {
-   DATASET "DS08BITS" {
-      DATATYPE  H5T_STD_I8LE
-      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
-      DATA {
-      }
-   }
-   DATASET "DS16BITS" {
-      DATATYPE  H5T_STD_I16LE
-      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
-      DATA {
-      }
-   }
-   DATASET "DS32BITS" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
-      DATA {
-      }
-   }
-   DATASET "DS64BITS" {
-      DATATYPE  H5T_STD_I64LE
-      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
-      DATA {
-      }
-   }
-   DATASET "DU08BITS" {
-      DATATYPE  H5T_STD_U8LE
-      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
-      DATA {
-      }
-   }
-   DATASET "DU16BITS" {
-      DATATYPE  H5T_STD_U16LE
-      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
-      DATA {
-      }
-   }
-   DATASET "DU32BITS" {
-      DATATYPE  H5T_STD_U32LE
-      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
-      DATA {
-      }
-   }
-   DATASET "DU64BITS" {
-      DATATYPE  H5T_STD_U64LE
-      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
-      DATA {
-      }
-   }
-   DATASET "DummyDBL" {
-      DATATYPE  H5T_IEEE_F64BE
-      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
-      DATA {
-      }
-   }
-}
-}
diff --git a/tools/testfiles/twithddl.exp b/tools/testfiles/twithddl.exp
new file mode 100644
index 0000000..f99d906
--- /dev/null
+++ b/tools/testfiles/twithddl.exp
@@ -0,0 +1,58 @@
+HDF5 "packedbits.h5" {
+GROUP "/" {
+   DATASET "DS08BITS" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+   DATASET "DS16BITS" {
+      DATATYPE  H5T_STD_I16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      }
+   }
+   DATASET "DS32BITS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      }
+   }
+   DATASET "DS64BITS" {
+      DATATYPE  H5T_STD_I64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      }
+   }
+   DATASET "DU08BITS" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+   DATASET "DU16BITS" {
+      DATATYPE  H5T_STD_U16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      }
+   }
+   DATASET "DU32BITS" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      }
+   }
+   DATASET "DU64BITS" {
+      DATATYPE  H5T_STD_U64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      }
+   }
+   DATASET "DummyDBL" {
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+}
+}
-- 
cgit v0.12