diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-20 15:04:21 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-20 15:04:21 (GMT) |
commit | 9a3b2c0b63931c1eb0ec396f1fa20a90abc6fc37 (patch) | |
tree | dd54e7eff6fa705a0c851c7968a6d332cea2f723 /test | |
parent | d03e8d183d3e35e33f6a82c45b44fb78a7de0254 (diff) | |
download | hdf5-9a3b2c0b63931c1eb0ec396f1fa20a90abc6fc37.zip hdf5-9a3b2c0b63931c1eb0ec396f1fa20a90abc6fc37.tar.gz hdf5-9a3b2c0b63931c1eb0ec396f1fa20a90abc6fc37.tar.bz2 |
[svn-r28141] Minor edits of SWMR acceptance test files.
Diffstat (limited to 'test')
-rw-r--r-- | test/swmr.c | 1 | ||||
-rw-r--r-- | test/swmr_common.h | 29 | ||||
-rw-r--r-- | test/swmr_generator.c | 2 | ||||
-rw-r--r-- | test/testswmr.sh.in | 4 |
4 files changed, 14 insertions, 22 deletions
diff --git a/test/swmr.c b/test/swmr.c index 51350d5..b079c98 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -5238,7 +5238,6 @@ main(void) #endif /* Tests on H5Pget/set_metadata_read_attempts() and H5Fget_metadata_read_retry_info() */ - /* These two tests are moved from tfile.c */ nerrors += test_metadata_read_attempts(fapl); nerrors += test_metadata_read_retry_info(fapl); diff --git a/test/swmr_common.h b/test/swmr_common.h index aed9a8e..1778f8e 100644 --- a/test/swmr_common.h +++ b/test/swmr_common.h @@ -1,13 +1,3 @@ -#ifndef _SWMR_COMMON_H -#define _SWMR_COMMON_H - -/* Headers needed */ - -#include <limits.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <time.h> /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * * Copyright by the Board of Trustees of the University of Illinois. * @@ -23,6 +13,17 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#ifndef _SWMR_COMMON_H +#define _SWMR_COMMON_H + +/* Headers needed */ + +#include <limits.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <time.h> + #include "hdf5.h" #include "h5test.h" @@ -30,13 +31,6 @@ /* Macros */ /**********/ -#ifndef TRUE -#define TRUE 1 -#endif /* TRUE */ -#ifndef FALSE -#define FALSE 0 -#endif /* FALSE */ - #define NLEVELS 5 /* # of datasets in the SWMR test file */ #define NMAPPING 9 @@ -81,3 +75,4 @@ int shutdown_symbols(void); int print_metadata_retries_info(hid_t fid); #endif /* _SWMR_COMMON_H */ + diff --git a/test/swmr_generator.c b/test/swmr_generator.c index 4e771eb..a5546f2 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -23,7 +23,7 @@ *------------------------------------------------------------------------- */ - /***********/ +/***********/ /* Headers */ /***********/ diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in index dd5bf31..cc5acd7 100644 --- a/test/testswmr.sh.in +++ b/test/testswmr.sh.in @@ -113,9 +113,7 @@ if [ $rc -ne 0 ] ; then exit 0 fi -# Parse option -# -p run ph5diff tests -# -h print help page +# Parse options (none accepted at this time) while [ $# -gt 0 ]; do case "$1" in *) # unknown option |