diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | hl/src/H5HL.h | 25 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/test/test_image.c | 3 | ||||
| -rw-r--r-- | hl/test/test_lite.c | 4 | ||||
| -rw-r--r-- | hl/test/test_table.c | 39 |
6 files changed, 42 insertions, 33 deletions
@@ -1550,7 +1550,6 @@ ./hl/Makefile.in ./hl/src/Dependencies ./hl/src/Makefile.in -./hl/src/H5HL.h ./hl/src/H5IM.c ./hl/src/H5IM.h ./hl/src/H5LT.c diff --git a/hl/src/H5HL.h b/hl/src/H5HL.h deleted file mode 100644 index 3b3d67b..0000000 --- a/hl/src/H5HL.h +++ /dev/null @@ -1,25 +0,0 @@ - -/**************************************************************************** - * NCSA HDF * - * Scientific Data Technologies * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ - - -#ifndef _H5HL_H -#define _H5HL_H - -#include "H5LT.h" -#include "H5IM.h" -#include "H5TA.h" - - - -#endif - diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index d98d0bc..5ab6f4a 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -11,7 +11,8 @@ srcdir=@srcdir@ ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. -CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ +CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/hl/src @CPPFLAGS@ + ## These are our main targets. They should be listed in the order to be ## executed, generally most specific tests to least specific tests. diff --git a/hl/test/test_image.c b/hl/test/test_image.c index aad9d95..d47cab1 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -12,7 +12,8 @@ ****************************************************************************/ -#include "H5HL.h" + +#include "H5IM.h" #define FILE_NAME "test_image.h5" #define WIDTH (hsize_t)500 diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index 56bad3a..bc5fb72 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -13,7 +13,9 @@ #include <stdlib.h> -#include "H5HL.h" + +#include "H5LT.h" + #define FILE_NAME "test_lite1.h5" #define FILE_NAME2 "test_lite2.h5" diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 5dd4855..fa1fbc1 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -11,7 +11,10 @@ * * ****************************************************************************/ -#include "H5HL.h" + + +#include "H5TA.h" + #include <stdlib.h> #include <assert.h> @@ -1443,6 +1446,10 @@ int main(void) { hid_t fid; /* identifier for the file */ unsigned flags=H5F_ACC_RDONLY; + char *srcdir = getenv("srcdir"); /* the source directory */ + char data_file[512]=""; /* buffer to hold name of existing data file */ + + /*------------------------------------------------------------------------- * test1: create a file for the write/read test @@ -1467,7 +1474,15 @@ int main(void) */ puts("Testing table with file open mode (read big-endian data):"); - fid=h5file_open("test_table_be.hdf5",flags); + /* compose the name of the file to open, using the srcdir, if appropriate */ + if ( srcdir ) + { + strcpy(data_file, srcdir); + strcat(data_file, "/"); + } + strcat( data_file, "test_table_be.hdf5"); + + fid=h5file_open(data_file,flags); /* test, do not write */ if (test_table(fid,0)<0) @@ -1482,7 +1497,15 @@ int main(void) */ puts("Testing table with file open mode (read little-endian data):"); - fid=h5file_open("test_table_le.hdf5",flags); + /* compose the name of the file to open, using the srcdir, if appropriate */ + if ( srcdir ) + { + strcpy(data_file, srcdir); + strcat(data_file, "/"); + } + strcat( data_file, "test_table_le.hdf5"); + + fid=h5file_open(data_file,flags); /* test, do not write */ if (test_table(fid,0)<0) @@ -1497,7 +1520,15 @@ int main(void) */ puts("Testing table with file open mode (read Cray data):"); - fid=h5file_open("test_table_cray.hdf5",flags); + /* compose the name of the file to open, using the srcdir, if appropriate */ + if ( srcdir ) + { + strcpy(data_file, srcdir); + strcat(data_file, "/"); + } + strcat( data_file, "test_table_cray.hdf5"); + + fid=h5file_open(data_file,flags); /* test, do not write */ if (test_table(fid,0)<0) |