diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-12-31 02:09:50 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-12-31 02:09:50 (GMT) |
commit | c194d4738ac6ed15475a9387272365265cec2ea5 (patch) | |
tree | 44162d112e8c872957aca934d9418777a36c3959 /test | |
parent | bac0fbe4d64dca6c7cf8cbd0991546cfec8c95be (diff) | |
download | hdf5-c194d4738ac6ed15475a9387272365265cec2ea5.zip hdf5-c194d4738ac6ed15475a9387272365265cec2ea5.tar.gz hdf5-c194d4738ac6ed15475a9387272365265cec2ea5.tar.bz2 |
[svn-r23122] Brought revisions from the trunk into the branch:
r23116-23118 : HDFFV-2686: Remove the ptExampleVL.c example from the source code
HDFFV-422: Change extention of the binary files from hdf5 to h5
Tested: jam (gnu)
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | test/dsets.c | 18 | ||||
-rw-r--r-- | test/test_filters_be.h5 (renamed from test/test_filters_be.hdf5) | bin | 5720 -> 5720 bytes | |||
-rw-r--r-- | test/test_filters_le.h5 (renamed from test/test_filters_le.hdf5) | bin | 5720 -> 5720 bytes |
4 files changed, 4 insertions, 18 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d6ffe42..03d311b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -106,8 +106,8 @@ SET (HDF5_REFERENCE_TEST_FILES tarrold.h5 tbad_msg_count.h5 tbogus.h5 - test_filters_be.hdf5 - test_filters_le.hdf5 + test_filters_be.h5 + test_filters_le.h5 th5s.h5 tlayouto.h5 tmtimen.h5 diff --git a/test/dsets.c b/test/dsets.c index 3b0d25d..7283aae 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -6584,8 +6584,7 @@ test_filters_endianess(void) hid_t dsid=-1; /* dataset ID */ hid_t sid=-1; /* dataspace ID */ hid_t dcpl=-1; /* dataset creation property list ID */ - char *srcdir = getenv("srcdir"); /* the source directory */ - char data_file[512]=""; /* buffer to hold name of existing file */ + const char *data_file = H5_get_srcdir_filename("test_filters_le.h5"); /* Corrected test file name */ TESTING("filters with big-endian/little-endian data"); @@ -6595,14 +6594,6 @@ test_filters_endianess(void) *------------------------------------------------------------------------- */ - /* compose the name of the file to open, using the srcdir, if appropriate */ - HDstrcpy(data_file, ""); - if(srcdir) { - HDstrcpy(data_file, srcdir); - HDstrcat(data_file, "/"); - } - HDstrcat(data_file, "test_filters_le.hdf5"); - /* open */ if((fid = H5Fopen(data_file, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR @@ -6618,12 +6609,7 @@ test_filters_endianess(void) */ /* compose the name of the file to open, using the srcdir, if appropriate */ - HDstrcpy(data_file, ""); - if(srcdir) { - HDstrcpy(data_file, srcdir); - HDstrcat(data_file, "/"); - } - HDstrcat(data_file, "test_filters_be.hdf5"); + data_file = H5_get_srcdir_filename("test_filters_be.h5"); /* Corrected test file name */ /* open */ if((fid = H5Fopen(data_file, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR diff --git a/test/test_filters_be.hdf5 b/test/test_filters_be.h5 Binary files differindex c4c127b..c4c127b 100644 --- a/test/test_filters_be.hdf5 +++ b/test/test_filters_be.h5 diff --git a/test/test_filters_le.hdf5 b/test/test_filters_le.h5 Binary files differindex ff8b846..ff8b846 100644 --- a/test/test_filters_le.hdf5 +++ b/test/test_filters_le.h5 |