[svn-r30095] Description:

Bring over fixes for CMake testing from the revise_chunks branch Tested on: MacOSX/64 10.11.5 (amazon) w/serial, parallel & production (h5committest forthcoming)
2016-06-19 03:48:44 -05:00
parent dd4744d3f6
commit f410d5d842
22 changed files with 64 additions and 60 deletions
--- a/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/h5fc_v_all.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_all.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_CONTIGUOUS...
 Open the dataset
--- a/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /GROUP/DSET_BT2...
 Open the dataset
 Retrieve the dataset's layout
--- a/tools/h5format_convert/testfiles/h5fc_v_err.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_err.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_ERR...
 Open the dataset
--- a/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_EA...
 Open the dataset
 Retrieve the dataset's layout
--- a/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_CONTIGUOUS...
 Open the dataset
--- a/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_NDATA_BT2...
 Open the dataset
 Retrieve the dataset's layout
--- a/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_CONTIGUOUS...
 Open the dataset
 Retrieve the dataset's layout
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 1
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0
--- a/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
   SUPERBLOCK_VERSION 2
   FREELIST_VERSION 0