[svn-r3770] Purpose:

Update
Description:
    Changed includes of the form:

            #include <hdf5_file.h>

    to

            #include "hdf5_file.h"

    so that gcc can pick them up easier without including the system
    header files since we don't care about them.
Platforms tested:
    Linux
This commit is contained in:
Bill Wendling 2001-04-03 13:09:16 -05:00
parent d57e19825b
commit bfd983e7f4
55 changed files with 108 additions and 109 deletions

View File

@ -5,7 +5,7 @@
* Programmer: Robb Matzke <matzke@llnl.gov> * Programmer: Robb Matzke <matzke@llnl.gov>
* Wednesday, April 8, 1998 * Wednesday, April 8, 1998
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"big", "big",

View File

@ -7,10 +7,10 @@
* *
* Purpose: Tests functions in H5Tbit.c * Purpose: Tests functions in H5Tbit.c
*/ */
#include <h5test.h> #include "h5test.h"
#define H5T_PACKAGE #define H5T_PACKAGE
#include <H5Tpkg.h> #include "H5Tpkg.h"
#define NTESTS 100000 #define NTESTS 100000

View File

@ -12,7 +12,7 @@
/* See H5private.h for how to include headers */ /* See H5private.h for how to include headers */
#undef NDEBUG #undef NDEBUG
#include <hdf5.h> #include "hdf5.h"
#ifdef H5_STDC_HEADERS #ifdef H5_STDC_HEADERS
# include <assert.h> # include <assert.h>

View File

@ -8,7 +8,7 @@
/* See H5private.h for how to include headers */ /* See H5private.h for how to include headers */
#undef NDEBUG #undef NDEBUG
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"cmpd_dset", "cmpd_dset",

View File

@ -15,7 +15,7 @@
3. Read the dataset into the memory buffer. 3. Read the dataset into the memory buffer.
4. Get some information about the dataset from the file. 4. Get some information about the dataset from the file.
*/ */
#include <h5test.h> #include "h5test.h"
#include <strings.h> #include <strings.h>
#ifndef H5_HAVE_GRIDSTORAGE #ifndef H5_HAVE_GRIDSTORAGE

View File

@ -15,7 +15,7 @@
3. Create a local memory buffer to hold the data. 3. Create a local memory buffer to hold the data.
4. Write the local data to the remote dataset. 4. Write the local data to the remote dataset.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_GRIDSTORAGE #ifndef H5_HAVE_GRIDSTORAGE
int main(void) int main(void)

View File

@ -8,7 +8,7 @@
* Purpose: Tests the dataset interface (H5D) * Purpose: Tests the dataset interface (H5D)
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"dataset", "dataset",

View File

@ -8,7 +8,7 @@
* Purpose: Tests the data type interface (H5T) * Purpose: Tests the data type interface (H5T)
*/ */
#include <h5test.h> #include "h5test.h"
/* Number of times to run each test */ /* Number of times to run each test */
#define NTESTS 1 #define NTESTS 1
@ -35,7 +35,7 @@
/* Alignment test stuff */ /* Alignment test stuff */
#ifdef TEST_ALIGNMENT #ifdef TEST_ALIGNMENT
#define H5T_PACKAGE #define H5T_PACKAGE
#include <H5Tpkg.h> #include "H5Tpkg.h"
#endif #endif
#define SET_ALIGNMENT(TYPE,VAL) \ #define SET_ALIGNMENT(TYPE,VAL) \
H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL) H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL)

View File

@ -5,7 +5,7 @@
* Programmer: Robb Matzke <matzke@llnl.gov> * Programmer: Robb Matzke <matzke@llnl.gov>
* Tuesday, December 22, 1998 * Tuesday, December 22, 1998
*/ */
#include <h5test.h> #include "h5test.h"
#define CPTR(VAR,CONST) ((VAR)=(CONST),&(VAR)) #define CPTR(VAR,CONST) ((VAR)=(CONST),&(VAR))
const char *FILENAME[] = { const char *FILENAME[] = {

View File

@ -8,7 +8,7 @@
* Purpose: Tests extendible datasets. * Purpose: Tests extendible datasets.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"extend", "extend",

View File

@ -7,7 +7,7 @@
* *
* Purpose: Tests datasets stored in external raw files. * Purpose: Tests datasets stored in external raw files.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"extern_1", "extern_1",

View File

@ -7,7 +7,7 @@
* *
* Purpose: Tests dataset fill values. * Purpose: Tests dataset fill values.
*/ */
#include <h5test.h> #include "h5test.h"
/* /*
* Define NO_FILLING if you want to compare how this test works when there is * Define NO_FILLING if you want to compare how this test works when there is

View File

@ -11,7 +11,7 @@
* calling _exit(0) since this doesn't flush HDF5 caches but * calling _exit(0) since this doesn't flush HDF5 caches but
* still exits with success. * still exits with success.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"flush", "flush",

View File

@ -10,7 +10,7 @@
* as the file was flushed first. This half tries to read the * as the file was flushed first. This half tries to read the
* file created by the first half. * file created by the first half.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"flush", "flush",

View File

@ -15,7 +15,7 @@
3. Create a local memory buffer to hold the data. 3. Create a local memory buffer to hold the data.
4. Write the local data to the remote dataset. 4. Write the local data to the remote dataset.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_GASS #ifndef H5_HAVE_GASS
int main(void) int main(void)

View File

@ -15,7 +15,7 @@
3. Read the dataset into the memory buffer. 3. Read the dataset into the memory buffer.
4. Get some information about the dataset from the file. 4. Get some information about the dataset from the file.
*/ */
#include <h5test.h> #include "h5test.h"
#include <strings.h> #include <strings.h>
#ifndef H5_HAVE_GASS #ifndef H5_HAVE_GASS

View File

@ -15,7 +15,7 @@
3. Create a local memory buffer to hold the data. 3. Create a local memory buffer to hold the data.
4. Write the local data to the remote dataset. 4. Write the local data to the remote dataset.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_GASS #ifndef H5_HAVE_GASS
int main(void) int main(void)

View File

@ -16,7 +16,7 @@
* The test file should be generated on a little-endian machine with * The test file should be generated on a little-endian machine with
* 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles. * 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles.
*/ */
#include <hdf5.h> #include "hdf5.h"
#define TESTFILE "tarrnew.h5" #define TESTFILE "tarrnew.h5"

View File

@ -15,7 +15,7 @@
* The test file should be generated on a little-endian machine with * The test file should be generated on a little-endian machine with
* 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles. * 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles.
*/ */
#include <hdf5.h> #include "hdf5.h"
#define TESTFILE "tarrold.h5" #define TESTFILE "tarrold.h5"

View File

@ -9,14 +9,14 @@
* collections but the collections are not related to one * collections but the collections are not related to one
* another by anything that appears in the file format. * another by anything that appears in the file format.
*/ */
#include <h5test.h> #include "h5test.h"
#include <H5private.h> #include "H5private.h"
#include <H5Eprivate.h> #include "H5Eprivate.h"
#include <H5Fprivate.h> #include "H5Fprivate.h"
#include <H5Gprivate.h> #include "H5Gprivate.h"
#include <H5HGprivate.h> #include "H5HGprivate.h"
#include <H5Iprivate.h> #include "H5Iprivate.h"
#include <H5Pprivate.h> #include "H5Pprivate.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"gheap1", "gheap1",

View File

@ -10,7 +10,8 @@
*/ */
#undef NDEBUG /*override -DNDEBUG */ #undef NDEBUG /*override -DNDEBUG */
#include <h5test.h> #include "h5test.h"
#ifdef WIN32 #ifdef WIN32
#include <process.h> #include <process.h>
#endif #endif

View File

@ -11,16 +11,15 @@
#define _H5TEST_H #define _H5TEST_H
#undef NDEBUG #undef NDEBUG
#include <hdf5.h> #include "hdf5.h"
#include "H5private.h"
#include <H5private.h>
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
# include <signal.h> # include <signal.h>
#endif #endif
#define H5T_PACKAGE #define H5T_PACKAGE
#include <H5Tpkg.h> /*to turn off hardware conversions*/ #include "H5Tpkg.h" /*to turn off hardware conversions*/
/* /*
* This contains the filename prefix specificied as command line option for * This contains the filename prefix specificied as command line option for

View File

@ -11,9 +11,9 @@
* because testing general dimensionalities would require us to * because testing general dimensionalities would require us to
* rewrite much of the hyperslab stuff. * rewrite much of the hyperslab stuff.
*/ */
#include <H5private.h> #include "H5private.h"
#include <H5MMprivate.h> #include "H5MMprivate.h"
#include <H5Vprivate.h> #include "H5Vprivate.h"
#ifndef H5_HAVE_FUNCTION #ifndef H5_HAVE_FUNCTION
#undef __FUNCTION__ #undef __FUNCTION__

View File

@ -8,8 +8,8 @@
/* See H5private.h for how to include headers */ /* See H5private.h for how to include headers */
#undef NDEBUG #undef NDEBUG
#include <hdf5.h> #include "hdf5.h"
#include <H5private.h> #include "H5private.h"
#ifdef H5_STDC_HEADERS #ifdef H5_STDC_HEADERS
# include <assert.h> # include <assert.h>

View File

@ -9,16 +9,16 @@
*/ */
#define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */
#include <h5test.h> #include "h5test.h"
#include <H5private.h> #include "H5private.h"
#include <H5Dprivate.h> #include "H5Dprivate.h"
#include <H5Iprivate.h> #include "H5Iprivate.h"
#include <H5Pprivate.h> #include "H5Pprivate.h"
#include <H5Fpkg.h> #include "H5Fpkg.h"
#include <H5Gprivate.h> #include "H5Gprivate.h"
#include <H5MMprivate.h> #include "H5MMprivate.h"
#include <H5Oprivate.h> #include "H5Oprivate.h"
#include <H5Vprivate.h> #include "H5Vprivate.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"istore", "istore",

View File

@ -7,9 +7,9 @@
* *
* Purpose: Test local heaps used by symbol tables (groups). * Purpose: Test local heaps used by symbol tables (groups).
*/ */
#include <h5test.h> #include "h5test.h"
#include <H5HLprivate.h> #include "H5HLprivate.h"
#include <H5Iprivate.h> #include "H5Iprivate.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"lheap", "lheap",

View File

@ -7,7 +7,7 @@
* *
* Purpose: Tests hard and soft (symbolic) links. * Purpose: Tests hard and soft (symbolic) links.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"links", "links",

View File

@ -7,7 +7,7 @@
* *
* Purpose: Tests file mounting. * Purpose: Tests file mounting.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"mount_1", "mount_1",

View File

@ -10,7 +10,7 @@
* very OS-dependent and this test tries to figure out if it's * very OS-dependent and this test tries to figure out if it's
* working properly. * working properly.
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"mtime", "mtime",

View File

@ -5,15 +5,15 @@
* Programmer: Robb Matzke <matzke@llnl.gov> * Programmer: Robb Matzke <matzke@llnl.gov>
* Tuesday, November 24, 1998 * Tuesday, November 24, 1998
*/ */
#include <h5test.h> #include "h5test.h"
#include <H5Iprivate.h> #include "H5Iprivate.h"
#include <H5Oprivate.h> #include "H5Oprivate.h"
/* /*
* This file needs to access private datatypes from the H5G package. * This file needs to access private datatypes from the H5G package.
*/ */
#define H5G_PACKAGE #define H5G_PACKAGE
#include <H5Gpkg.h> #include "H5Gpkg.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"ohdr", "ohdr",

View File

@ -10,7 +10,7 @@
/* See H5private.h for how to include headers */ /* See H5private.h for how to include headers */
#undef NDEBUG #undef NDEBUG
#include <hdf5.h> #include "hdf5.h"
#ifdef H5_STDC_HEADERS #ifdef H5_STDC_HEADERS
# include <ctype.h> # include <ctype.h>
@ -21,7 +21,7 @@
#endif #endif
#ifdef H5_HAVE_IO_H #ifdef H5_HAVE_IO_H
# include <io.h> # include <io.h>
#endif #endif
#ifdef H5_HAVE_UNISTD_H #ifdef H5_HAVE_UNISTD_H

View File

@ -14,7 +14,7 @@
* Don't forget to change H5S_MAX_RANK back to its original * Don't forget to change H5S_MAX_RANK back to its original
* value and recompile once the test file is created. * value and recompile once the test file is created.
*/ */
#include <hdf5.h> #include "hdf5.h"
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------

View File

@ -49,7 +49,7 @@
* absolute path. It you use SDSC server(ghidorah.sdsc.edu), your * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your
* home directory is possibly in /projects/mdas/srb/SRBVault/. * home directory is possibly in /projects/mdas/srb/SRBVault/.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_SRB #ifndef H5_HAVE_SRB
int main(void) int main(void)

View File

@ -48,7 +48,7 @@
* absolute path. It you use SDSC server(ghidorah.sdsc.edu), your * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your
* home directory is possibly in /projects/mdas/srb/SRBVault/. * home directory is possibly in /projects/mdas/srb/SRBVault/.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_SRB #ifndef H5_HAVE_SRB
int main(void) int main(void)

View File

@ -49,7 +49,7 @@
* home directory is possibly in /projects/mdas/srb/SRBVault/. * home directory is possibly in /projects/mdas/srb/SRBVault/.
*/ */
#include <h5test.h> #include "h5test.h"
#ifndef H5_HAVE_SRB #ifndef H5_HAVE_SRB
int main(void) int main(void)

View File

@ -5,13 +5,13 @@
* Programmer: Robb Matzke <matzke@llnl.gov> * Programmer: Robb Matzke <matzke@llnl.gov>
* Tuesday, November 24, 1998 * Tuesday, November 24, 1998
*/ */
#include <h5test.h> #include "h5test.h"
/* /*
* This file needs to access private datatypes from the H5G package. * This file needs to access private datatypes from the H5G package.
*/ */
#define H5G_PACKAGE #define H5G_PACKAGE
#include <H5Gpkg.h> #include "H5Gpkg.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"stab1", "stab1",

View File

@ -33,7 +33,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <hdf5.h> #include "hdf5.h"
#ifndef H5_HAVE_STREAM #ifndef H5_HAVE_STREAM

View File

@ -20,9 +20,8 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include "hdf5.h"
#include <hdf5.h>
#define FILENAME "tarray1.h5" #define FILENAME "tarray1.h5"
#define TESTFILE "tarrold.h5" #define TESTFILE "tarrold.h5"

View File

@ -20,9 +20,8 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include "hdf5.h"
#include <hdf5.h>
#define FILENAME "tattr.h5" #define FILENAME "tattr.h5"
#define ATTR_NAME_LEN 16 #define ATTR_NAME_LEN 16

View File

@ -52,7 +52,7 @@ int num_errs = 0;
int Verbosity; int Verbosity;
/* ANY new test needs to have a prototype in tproto.h */ /* ANY new test needs to have a prototype in tproto.h */
#include <testhdf5.h> #include "testhdf5.h"
struct TestStruct { struct TestStruct {
int NumErrors; int NumErrors;

View File

@ -23,8 +23,8 @@
* Include required headers. This file tests internal library functions, * Include required headers. This file tests internal library functions,
* so we include the private headers here. * so we include the private headers here.
*/ */
#include <H5private.h> #include "H5private.h"
#include <H5Eprivate.h> #include "H5Eprivate.h"
#ifndef HDF5_TEST_MASTER #ifndef HDF5_TEST_MASTER
extern int num_errs; extern int num_errs;

View File

@ -20,11 +20,11 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <H5private.h> #include "H5private.h"
#include <H5Bprivate.h> #include "H5Bprivate.h"
#include <H5Pprivate.h> #include "H5Pprivate.h"
#define F1_USERBLOCK_SIZE (hsize_t)0 #define F1_USERBLOCK_SIZE (hsize_t)0
#define F1_OFFSET_SIZE sizeof(haddr_t) #define F1_OFFSET_SIZE sizeof(haddr_t)

View File

@ -20,9 +20,8 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include "hdf5.h"
#include <hdf5.h>
#define FILENAME "tgenprop.h5" #define FILENAME "tgenprop.h5"

View File

@ -20,12 +20,12 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <H5private.h> #include "H5private.h"
#include <H5Bprivate.h> #include "H5Bprivate.h"
#include <H5Sprivate.h> #include "H5Sprivate.h"
#include <H5Pprivate.h> #include "H5Pprivate.h"
#define TESTFILE "th5s.h5" #define TESTFILE "th5s.h5"
#define DATAFILE "th5s1.h5" #define DATAFILE "th5s1.h5"

View File

@ -20,9 +20,9 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define DATAFILE "titerate.h5" #define DATAFILE "titerate.h5"

View File

@ -20,10 +20,10 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <H5private.h> #include "H5private.h"
#include <H5Fprivate.h> #include "H5Fprivate.h"
#define TEST_INT16_VALUE -7641 #define TEST_INT16_VALUE -7641
#define TEST_UINT16_VALUE 45002 #define TEST_UINT16_VALUE 45002

View File

@ -20,9 +20,9 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define FILE1 "trefer1.h5" #define FILE1 "trefer1.h5"
#define FILE2 "trefer2.h5" #define FILE2 "trefer2.h5"

View File

@ -20,9 +20,9 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define FILENAME "tselect.h5" #define FILENAME "tselect.h5"

View File

@ -33,6 +33,7 @@
*/ */
#include <time.h> #include <time.h>
#include "testhdf5.h" #include "testhdf5.h"
#include "H5TBprivate.h" #include "H5TBprivate.h"

View File

@ -20,9 +20,9 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define DATAFILE "ttime.h5" #define DATAFILE "ttime.h5"

View File

@ -39,7 +39,8 @@
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#include <ttsafe.h>
#include "ttsafe.h"
#ifndef H5_HAVE_THREADSAFE #ifndef H5_HAVE_THREADSAFE
int main(void) int main(void)

View File

@ -19,15 +19,15 @@
#ifndef HDF5TEST_H #ifndef HDF5TEST_H
#define HDF5TEST_H #define HDF5TEST_H
#include <hdf5.h>
#include <string.h> #include <string.h>
/* /*
* Include required headers. This file tests internal library functions, * Include required headers. This file tests internal library functions,
* so we include the private headers here. * so we include the private headers here.
*/ */
#include <H5private.h> #include "hdf5.h"
#include <H5Eprivate.h> #include "H5private.h"
#include "H5Eprivate.h"
#ifdef H5_HAVE_THREADSAFE #ifdef H5_HAVE_THREADSAFE
/* Include pthread library for threadsafe tests */ /* Include pthread library for threadsafe tests */

View File

@ -24,9 +24,9 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define DATAFILE "tvlstr.h5" #define DATAFILE "tvlstr.h5"

View File

@ -20,9 +20,9 @@
* *
*************************************************************/ *************************************************************/
#include <testhdf5.h> #include "testhdf5.h"
#include <hdf5.h> #include "hdf5.h"
#define FILENAME "tvltypes.h5" #define FILENAME "tvltypes.h5"

View File

@ -7,7 +7,7 @@
* *
* Purpose: Test H5Gunlink(). * Purpose: Test H5Gunlink().
*/ */
#include <h5test.h> #include "h5test.h"
const char *FILENAME[] = { const char *FILENAME[] = {
"unlink", "unlink",