diff options
| author | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-11 20:51:21 (GMT) |
|---|---|---|
| committer | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-11 20:51:21 (GMT) |
| commit | 1d1e96f1dd7a6f7272260ad6f0e1b3a426e5c54c (patch) | |
| tree | fab02c599fe9eabacd6eac4101ff6decb9e74b64 | |
| parent | c3c3c1e1426e4f2b8229ad8fe5cc4416a1156da5 (diff) | |
| download | hdf5-1d1e96f1dd7a6f7272260ad6f0e1b3a426e5c54c.zip hdf5-1d1e96f1dd7a6f7272260ad6f0e1b3a426e5c54c.tar.gz hdf5-1d1e96f1dd7a6f7272260ad6f0e1b3a426e5c54c.tar.bz2 | |
Some coding style changes.
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/external_env.c | 3 | ||||
| -rw-r--r-- | test/testexternal_env.sh.in | 6 | ||||
| -rw-r--r-- | test/testvds_env.sh.in | 8 | ||||
| -rw-r--r-- | test/vds_env.c | 2 |
6 files changed, 12 insertions, 13 deletions
@@ -1135,6 +1135,7 @@ ./test/testmeta.c ./test/testswmr.sh.in ./test/testvdsswmr.sh.in +./test/testvds_env.sh.in ./test/tfile.c ./test/tgenprop.c ./test/th5o.c @@ -1174,6 +1175,7 @@ ./test/use_disable_mdc_flushes.c ./test/use.h ./test/vds.c +./test/vds_env.c ./test/vds_swmr.h ./test/vds_swmr_gen.c ./test/vds_swmr_reader.c diff --git a/test/Makefile.am b/test/Makefile.am index 55b5a88..1b82aa4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src # testlinks_env.sh: links_env # testexternal_env.sh: external_env # testflushrefresh.sh: flushrefresh -# testvds_env.sh: vds_env +# testvds_env.sh: vds_env # testswmr.sh: swmr* # testvdsswmr.sh: vds_swmr* # testabort_fail.sh: filenotclosed.c and del_many_dense_attrs.c @@ -63,7 +63,7 @@ TEST_PROG= testhdf5 \ flush1 flush2 app_ref enum set_extent ttsafe enc_dec_plist \ enc_dec_plist_cross_platform getname vfd ntypes dangle dtransform \ reserved cross_read freespace mf vds file_image unregister \ - cache_logging cork swmr vol_tst + cache_logging cork swmr vol # List programs to be built when testing here. # error_test and err_compat are built at the same time as the other tests, but executed by testerror.sh. diff --git a/test/external_env.c b/test/external_env.c index 2f5f838..0f8c9ec 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -12,9 +12,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Robb Matzke <matzke@llnl.gov> - * Tuesday, March 3, 1998 - * * Purpose: Tests datasets stored in external raw files. */ #include "external_common.h" diff --git a/test/testexternal_env.sh.in b/test/testexternal_env.sh.in index dff3851..3cc140d 100644 --- a/test/testexternal_env.sh.in +++ b/test/testexternal_env.sh.in @@ -25,9 +25,9 @@ nerrors=0 # test for external file with HDF5_EXTFILE_PREFIX echo "Testing external file with HDF5_EXTFILE_PREFIX" -TEST_NAME=external_env # The test name -TEST_BIN=`pwd`/$TEST_NAME # The path of the test binary -ENVCMD="env HDF5_EXTFILE_PREFIX=\${ORIGIN}" # The environment variable & value +TEST_NAME=external_env # The test name +TEST_BIN=`pwd`/$TEST_NAME # The path of the test binary +ENVCMD="env HDF5_EXTFILE_PREFIX=\${ORIGIN}" # The environment variable & value # # Run the test # echo "$ENVCMD $RUNSERIAL $TEST_BIN" diff --git a/test/testvds_env.sh.in b/test/testvds_env.sh.in index 870f2eb..894e52e 100644 --- a/test/testvds_env.sh.in +++ b/test/testvds_env.sh.in @@ -25,10 +25,10 @@ nerrors=0 # test for VDS with HDF5_VDS_PREFIX echo "Testing basic virtual dataset I/O via H5Pset_vds_prefix(): all selection with ENV prefix" -TEST_NAME=vds_env # The test name -TEST_BIN=`pwd`/$TEST_NAME # The path of the test binary -ENVCMD="env HDF5_VDS_PREFIX=\${ORIGIN}/tmp" # Set the environment variable & value -UNENVCMD="unset HDF5_VDS_PREFIX" # Unset the environment variable & value +TEST_NAME=vds_env # The test name +TEST_BIN=`pwd`/$TEST_NAME # The path of the test binary +ENVCMD="env HDF5_VDS_PREFIX=\${ORIGIN}/tmp" # Set the environment variable & value +UNENVCMD="unset HDF5_VDS_PREFIX" # Unset the environment variable & value # # Run the test # echo "$ENVCMD $RUNSERIAL $TEST_BIN" diff --git a/test/vds_env.c b/test/vds_env.c index b42bb00..4ee8096 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -309,7 +309,7 @@ main(void) if((my_fapl = H5Pcopy(fapl)) < 0) TEST_ERROR /* Loop through all the combinations of low/high version bounds */ - for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { + for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; H5_INC_ENUM(H5F_libver_t, low)) { for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { char msg[80]; /* Message for file version bounds */ char *low_string; /* The low bound string */ |