diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cache_image.c | 2 | ||||
| -rw-r--r-- | test/objcopy_ref.c | 46 | ||||
| -rw-r--r-- | test/page_buffer.c | 20 | ||||
| -rw-r--r-- | test/tmisc.c | 7 |
4 files changed, 20 insertions, 55 deletions
diff --git a/test/cache_image.c b/test/cache_image.c index 59689a9..bada814 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -7825,7 +7825,7 @@ get_free_sections_test(hbool_t single_file_vfd) *------------------------------------------------------------------------- */ static unsigned -evict_on_close_test(hbool_t single_file_vfd) +evict_on_close_test(hbool_t H5_ATTR_UNUSED single_file_vfd) { #ifndef H5_HAVE_PARALLEL const char * fcn_name = "evict_on_close_test()"; diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index b539b8a..33d1f64 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -44,53 +44,15 @@ const char *FILENAME[] = { #define CONFIG_DENSE 16 #define MAX_CONFIGURATION 31 -#define NAME_DATATYPE_SIMPLE "H5T_NATIVE_INT" -#define NAME_DATATYPE_SIMPLE2 "H5T_NATIVE_INT-2" -#define NAME_DATATYPE_VL "vlen of int" -#define NAME_DATATYPE_VL_VL "vlen of vlen of int" #define NAME_DATASET_SIMPLE "dataset_simple" -#define NAME_DATASET_SIMPLE2 "dataset_simple_copy" -#define NAME_DATASET_SIMPLE3 "dataset_simple_another_copy" -#define NAME_DATASET_COMPOUND "dataset_compound" -#define NAME_DATASET_CHUNKED "dataset_chunked" -#define NAME_DATASET_CHUNKED_SINGLE "dataset_chunked_single" -#define NAME_DATASET_CHUNKED2 "dataset_chunked2" -#define NAME_DATASET_CHUNKED2_SINGLE "dataset_chunked2_single" -#define NAME_DATASET_CHUNKED3 "dataset_chunked3" -#define NAME_DATASET_CHUNKED3_SINGLE "dataset_chunked3_single" -#define NAME_DATASET_CHUNKED4 "dataset_chunked4" -#define NAME_DATASET_CHUNKED4_SINGLE "dataset_chunked4_single" -#define NAME_DATASET_COMPACT "dataset_compact" -#define NAME_DATASET_EXTERNAL "dataset_ext" -#define NAME_DATASET_NAMED_DTYPE "dataset_named_dtype" -#define NAME_DATASET_NAMED_DTYPE2 "dataset_named_dtype2" -#define NAME_DATASET_MULTI_OHDR "dataset_multi_ohdr" -#define NAME_DATASET_MULTI_OHDR2 "dataset_multi_ohdr2" -#define NAME_DATASET_VL "dataset_vl" -#define NAME_DATASET_VL2 "dataset_vl2" -#define NAME_DATASET_VL_VL "dataset_vl_vl" -#define NAME_DATASET_VL_VL2 "dataset_vl_vl2" -#define NAME_DATASET_CMPD_VL "dataset_cmpd_vl" #define NAME_DATASET_SUB_SUB "/g0/g00/g000/dataset_simple" #define NAME_GROUP_UNCOPIED "/uncopied" -#define NAME_GROUP_EMPTY "/empty" #define NAME_GROUP_TOP "/g0" -#define NAME_GROUP_TOP2 "/g1" -#define NAME_GROUP_TOP3 "/g2" -#define NAME_GROUP_TOP4 "/g3" #define NAME_GROUP_SUB "/g0/g00" -#define NAME_GROUP_SUB_2 "/g0/g01" -#define NAME_GROUP_SUB_SUB "/g0/g00/g000" #define NAME_GROUP_SUB_SUB2 "g000" -#define NAME_GROUP_DATASET "/g0/dataset_simple" #define NAME_GROUP_LINK "/g_links" #define NAME_GROUP_LINK2 "/g_links2" -#define NAME_GROUP_LOOP "g_loop" -#define NAME_GROUP_LOOP2 "g_loop2" -#define NAME_GROUP_LOOP3 "g_loop3" #define NAME_GROUP_REF "ref_grp" -#define NAME_LINK_DATASET "/g_links/dataset_simple" -#define NAME_LINK_HARD "/g_links/hard_link_to_dataset_simple" #define NAME_LINK_SOFT "/g_links/soft_link_to_dataset_simple" #define NAME_LINK_SOFT2 "/g_links2/soft_link_to_dataset_simple" #define NAME_LINK_EXTERN "/g_links/external_link_to_dataset_simple" @@ -99,19 +61,11 @@ const char *FILENAME[] = { #define NAME_LINK_SOFT_DANGLE2 "/g_links2/soft_link_to_nowhere" #define NAME_LINK_EXTERN_DANGLE "/g_links/external_link_to_nowhere" #define NAME_LINK_EXTERN_DANGLE2 "/g_links2/external_link_to_nowhere" -#define NAME_OLD_FORMAT "/dset1" #define NAME_BUF_SIZE 1024 #define ATTR_NAME_LEN 80 #define DIM_SIZE_1 12 #define DIM_SIZE_2 6 -#define MAX_DIM_SIZE_1 100 -#define MAX_DIM_SIZE_2 80 -#define CHUNK_SIZE_1 5 /* Not an even fraction of dimension sizes, so we test copying partial chunks */ -#define CHUNK_SIZE_2 5 -#define NUM_SUB_GROUPS 20 -#define NUM_WIDE_LOOP_GROUPS 10 -#define NUM_DATASETS 10 unsigned num_attributes_g; /* Number of attributes created */ diff --git a/test/page_buffer.c b/test/page_buffer.c index 5313c9b..f6ce4a7 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -43,18 +43,21 @@ #define NY 50 /* helper routines */ +#ifndef H5_HAVE_PARALLEL static unsigned create_file(char *filename, hid_t fcpl, hid_t fapl); static unsigned open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size); +#endif /* H5_HAVE_PARALLEL */ /* test routines */ +#ifdef H5_HAVE_PARALLEL +static unsigned verify_page_buffering_disabled(hid_t orig_fapl, + const char *env_h5_drvr); +#else static unsigned test_args(hid_t fapl, const char *env_h5_drvr); static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr); -#ifdef H5_HAVE_PARALLEL -static unsigned verify_page_buffering_disabled(hid_t orig_fapl, - const char *env_h5_drvr); #endif /* H5_HAVE_PARALLEL */ const char *FILENAME[] = { @@ -379,6 +382,8 @@ error: * *------------------------------------------------------------------------- */ + +#ifndef H5_HAVE_PARALLEL static unsigned test_args(hid_t orig_fapl, const char *env_h5_drvr) { @@ -533,6 +538,7 @@ error: } H5E_END_TRY; return 1; } /* test_args */ +#endif /*------------------------------------------------------------------------- @@ -565,6 +571,7 @@ error: */ /* Changes due to file space page size has a minimum size of 512 */ +#ifndef H5_HAVE_PARALLEL static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) { @@ -810,6 +817,7 @@ error: } H5E_END_TRY; return 1; } /* test_raw_data_handling */ +#endif /*------------------------------------------------------------------------- @@ -842,6 +850,7 @@ error: *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) { @@ -1063,6 +1072,7 @@ error: } H5E_END_TRY; return 1; } /* test_lru_processing */ +#endif /*------------------------------------------------------------------------- @@ -1096,6 +1106,7 @@ error: *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) { @@ -1699,6 +1710,7 @@ error: return 1; } /* test_min_threshold */ +#endif /*------------------------------------------------------------------------- @@ -1731,6 +1743,7 @@ error: * *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) { @@ -2002,6 +2015,7 @@ error: return 1; } /* test_stats_collection */ +#endif /*------------------------------------------------------------------------- diff --git a/test/tmisc.c b/test/tmisc.c index d637802..b1a3ef1 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -128,15 +128,12 @@ typedef struct /* Definitions for misc. test #8 */ #define MISC8_FILE "tmisc8.h5" #define MISC8_DSETNAME1 "Dataset1" -#define MISC8_DSETNAME2 "Dataset2" -#define MISC8_DSETNAME3 "Dataset3" #define MISC8_DSETNAME4 "Dataset4" #define MISC8_DSETNAME5 "Dataset5" -#define MISC8_DSETNAME6 "Dataset6" +#ifndef H5_HAVE_PARALLEL #define MISC8_DSETNAME7 "Dataset7" +#endif #define MISC8_DSETNAME8 "Dataset8" -#define MISC8_DSETNAME9 "Dataset9" -#define MISC8_DSETNAME10 "Dataset10" #define MISC8_RANK 2 #define MISC8_DIM0 50 #define MISC8_DIM1 50 |