diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-28 03:55:51 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 03:55:51 (GMT) |
commit | fe4b1c572841fff38a6b9422ea63d345ccfa96bf (patch) | |
tree | 5e9567294dff5625010f4fbfc710bc1c547ea3a0 /test/tsohm.c | |
parent | e6210c80cfe823a7ee6e938daf9e87d302ca9a8e (diff) | |
download | hdf5-fe4b1c572841fff38a6b9422ea63d345ccfa96bf.zip hdf5-fe4b1c572841fff38a6b9422ea63d345ccfa96bf.tar.gz hdf5-fe4b1c572841fff38a6b9422ea63d345ccfa96bf.tar.bz2 |
Sync testhdf5 files w/ develop (#3300)
Diffstat (limited to 'test/tsohm.c')
-rw-r--r-- | test/tsohm.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/test/tsohm.c b/test/tsohm.c index 6d6946d..fd931a0 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -26,20 +26,21 @@ /* Default SOHM values */ #define DEF_NUM_INDEXES 0 -const unsigned def_type_flags[H5O_SHMESG_MAX_NINDEXES] = {0, 0, 0, 0, 0, 0}; -const unsigned def_minsizes[H5O_SHMESG_MAX_NINDEXES] = {250, 250, 250, 250, 250, 250}; +static const unsigned def_type_flags[H5O_SHMESG_MAX_NINDEXES] = {0, 0, 0, 0, 0, 0}; +static const unsigned def_minsizes[H5O_SHMESG_MAX_NINDEXES] = {250, 250, 250, 250, 250, 250}; #define DEF_L2B 50 #define DEF_B2L 40 /* Non-default SOHM values for testing */ #define TEST_NUM_INDEXES 4 -const unsigned test_type_flags[H5O_SHMESG_MAX_NINDEXES] = {H5O_SHMESG_FILL_FLAG, - H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_ATTR_FLAG, - H5O_SHMESG_SDSPACE_FLAG, - H5O_SHMESG_PLINE_FLAG, - 0, - 0}; -const unsigned test_minsizes[H5O_SHMESG_MAX_NINDEXES] = {0, 2, 40, 100, 3, 1000}; +static const unsigned test_type_flags[H5O_SHMESG_MAX_NINDEXES] = {H5O_SHMESG_FILL_FLAG, + H5O_SHMESG_DTYPE_FLAG | + H5O_SHMESG_ATTR_FLAG, + H5O_SHMESG_SDSPACE_FLAG, + H5O_SHMESG_PLINE_FLAG, + 0, + 0}; +static const unsigned test_minsizes[H5O_SHMESG_MAX_NINDEXES] = {0, 2, 40, 100, 3, 1000}; #define TEST_L2B 65 #define TEST_B2L 64 @@ -69,31 +70,31 @@ typedef struct dtype1_struct { } dtype1_struct; #define DTYPE2_SIZE 1024 -const char *DSETNAME[] = {"dataset0", "dataset1", "dataset2", "dataset3", "dataset4", - "dataset5", "dataset6", "dataset7", "dataset8", "dataset9", - "dataset10", "dataset11", NULL}; -const char *EXTRA_DSETNAME[] = {"ex_dataset0", "ex_dataset1", "ex_dataset2", - "ex_dataset3", "ex_dataset4", "ex_dataset5", - "ex_dataset6", "ex_dataset7", "ex_dataset8", - "ex_dataset9", "ex_dataset10", "ex_dataset11", - "ex_dataset12", "ex_dataset13", "ex_dataset14", - "ex_dataset15", "ex_dataset16", "ex_dataset17", - "ex_dataset18", "ex_dataset19", NULL}; +static const char *DSETNAME[] = {"dataset0", "dataset1", "dataset2", "dataset3", "dataset4", + "dataset5", "dataset6", "dataset7", "dataset8", "dataset9", + "dataset10", "dataset11", NULL}; +static const char *EXTRA_DSETNAME[] = {"ex_dataset0", "ex_dataset1", "ex_dataset2", + "ex_dataset3", "ex_dataset4", "ex_dataset5", + "ex_dataset6", "ex_dataset7", "ex_dataset8", + "ex_dataset9", "ex_dataset10", "ex_dataset11", + "ex_dataset12", "ex_dataset13", "ex_dataset14", + "ex_dataset15", "ex_dataset16", "ex_dataset17", + "ex_dataset18", "ex_dataset19", NULL}; #define SOHM_HELPER_NUM_EX_DSETS 20 typedef struct complex_t { double re; double im; } complex_t; #define ENUM_NUM_MEMBS 20 -const char *ENUM_NAME[] = {"enum_member0", "enum_member1", "enum_member2", - "enum_member3", "enum_member4", "enum_member5", - "enum_member6", "enum_member7", "enum_member8", - "enum_member9", "enum_member10", "enum_member11", - "enum_member12", "enum_member13", "enum_member14", - "enum_member15", "enum_member16", "enum_member17", - "enum_member18", "enum_member19", NULL}; -const int ENUM_VAL[] = {0, 13, -500, 63, 64, -64, 65, 2048, 1, 2, -1, - 7, 130, -5000, 630, 640, -640, 650, 20480, 10, -1001, -10}; +static const char *ENUM_NAME[] = {"enum_member0", "enum_member1", "enum_member2", + "enum_member3", "enum_member4", "enum_member5", + "enum_member6", "enum_member7", "enum_member8", + "enum_member9", "enum_member10", "enum_member11", + "enum_member12", "enum_member13", "enum_member14", + "enum_member15", "enum_member16", "enum_member17", + "enum_member18", "enum_member19", NULL}; +static const int ENUM_VAL[] = {0, 13, -500, 63, 64, -64, 65, 2048, 1, 2, -1, + 7, 130, -5000, 630, 640, -640, 650, 20480, 10, -1001, -10}; #define SIZE2_RANK1 6 #define SIZE2_RANK2 10 #define SIZE2_DIMS \ @@ -1316,7 +1317,7 @@ test_sohm_attrs(void) ret = H5Pclose(fcpl_id); CHECK_I(ret, "H5Pclose"); } - H5E_END_TRY; + H5E_END_TRY /* three shared message indices */ @@ -2110,9 +2111,9 @@ test_sohm_size2(int close_reopen) herr_t ret; if (close_reopen == 0) - MESSAGE(5, ("Testing that shared object header messages save space\n")) + MESSAGE(5, ("Testing that shared object header messages save space\n")); else - MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n")) + MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n")); /* Create an fcpl with SOHMs disabled */ fcpl_id = H5Pcreate(H5P_FILE_CREATE); @@ -3265,7 +3266,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define TSOHM_VDE_VERIFY_SPACES(dims) \ - { \ + do { \ /* Open dataspaces \ */ \ space1_id = H5Dget_space(dset1_id); \ @@ -3299,7 +3300,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) CHECK_I(H5Sclose(space1_id), "H5Sclose"); \ CHECK_I(H5Sclose(space2_id), "H5Sclose"); \ CHECK_I(H5Sclose(space3_id), "H5Sclose"); \ - } /* define TSOHM_VDE_VERIFY_SPACES */ + } while (0) /* define TSOHM_VDE_VERIFY_SPACES */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * Macro: TSOHM_VDE_CLOSE_REOPEN_FILE_AND_DSETS() @@ -3314,7 +3315,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define TSOHM_VDE_CLOSE_REOPEN_FILE_AND_DSETS(n) \ - { \ + do { \ CHECK_I(H5Dclose(dset1_id), "H5Dclose"); \ if ((n) > 1) \ CHECK_I(H5Dclose(dset2_id), "H5Dclose"); \ @@ -3334,7 +3335,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) dset3_id = H5Dopen2(file_id, "dataset3", H5P_DEFAULT); \ CHECK_I(dset3_id, "H5Dopen2"); \ } \ - } /* define TSOHM_VDE_CLOSE_REOPEN_FILE_AND_DSETS */ + } while (0) /* define TSOHM_VDE_CLOSE_REOPEN_FILE_AND_DSETS */ /* Remember the current # of reported errors */ old_nerrs = GetTestNumErrs(); |