[svn-r8775]

Purpose:
Fixed a bug that broke daily tests.
SZIP now always uses K13 compression.

Description:
When configured with the --srcdir option, dsets test would look for
a test file in the same directory as the test, instead of in the
directory that contains the source files.

SZIP never needs to use CHIP compression, so the option to set this flag
instead of K13 compression has been removed.



Platforms tested:
Copper

1 files changed, 12 insertions, 1 deletions

diff --git a/test/dsets.c b/test/dsets.c
index ee9194b..09587f5 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1649,8 +1649,19 @@ test_filter_noencoder(const char *dset_name)
         int test_ints[10] = { 12 };
         int read_buf[10];
         int i;
+        char * srcdir = HDgetenv("srcdir"); /* The source directory */
+        char testfile[512]="";	/* Buffer to hold name of test file */
+
+        /* Create the name of the file to open (in case we are using the --srcdir
+         * option.  */
+        if (srcdir && ((HDstrlen(srcdir) + HDstrlen(NOENCODER_FILENAME) + 1) < sizeof(testfile)) )
+        {
+            HDstrcpy(testfile, srcdir);
+            HDstrcat(testfile, "/");
+        }
+        HDstrcat(testfile, NOENCODER_FILENAME);
 
-        file_id = H5Fopen(NOENCODER_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT);
+        file_id = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
         if (file_id < 0) goto error;
 
         dset_id = H5Dopen(file_id, dset_name);