[svn-r27343] Changed test/test_swmr.c to swmr.c to be more in line with other test

names to and to make it more obvious that this is a unit test and not
run via the testswmr.sh script.

The H5FD.c changes are due to updated trace statements when reconfiguring.

Tested on: jam

5 files changed, 29 insertions, 29 deletions

diff --git a/MANIFEST b/MANIFEST
index ef37eed..3acb36e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1067,6 +1067,7 @@
 # ====end distribute this for now. See HDFFV-8236====
 ./test/specmetaread.h5
 ./test/stab.c
+./test/swmr.c
 ./test/swmr_addrem_writer.c
 ./test/swmr_check_compat_vfd.c
 ./test/swmr_common.c
@@ -1100,7 +1101,6 @@
 ./test/test_usecases.sh.in
 ./test/testmeta.c
 ./test/testswmr.sh.in
-./test/test_swmr.c
 ./test/tfile.c
 ./test/tgenprop.c
 ./test/th5o.c
diff --git a/src/H5FD.c b/src/H5FD.c
index e4c8d7a..bda9357 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -1984,7 +1984,7 @@ H5FDlock(H5FD_t *file, hbool_t rw)
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "*xu", file, rw);
+    H5TRACE2("e", "*xb", file, rw);
 
     /* Check args */
     if(!file || !file->cls)
@@ -2047,7 +2047,7 @@ H5FDunlock(H5FD_t *file)
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("a", "*x", file);
+    H5TRACE1("e", "*x", file);
 
     /* Check args */
     if(!file || !file->cls)
diff --git a/test/Makefile.am b/test/Makefile.am
index 3663fd0..c7f9570 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -59,7 +59,7 @@ TEST_PROG= testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
            set_extent ttsafe enc_dec_plist enc_dec_plist_with_endianess\
            getname vfd ntypes dangle dtransform reserved cross_read \
            freespace mf farray earray btree2 fheap file_image unregister \
-           cache_logging cork test_swmr
+           cache_logging cork swmr
 
 # 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.
@@ -69,7 +69,7 @@ TEST_PROG= testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
 # links_env is used by testlinks_env.sh
 # flushrefresh is used by testflushrefresh.sh.
 # use_append_chunk, use_append_mchunks and use_disable_mdc_flushes are used by test_usecases.sh
-# swmr* files are used by testswmr.sh.
+# swmr_* files (besides swmr.c) are used by testswmr.sh.
 # 'make check' doesn't run them directly, so they are not included in TEST_PROG.
 # Also build testmeta, which is used for timings test.  It builds quickly,
 # and this lets automake keep all its test programs in one place.
diff --git a/test/Makefile.in b/test/Makefile.in
index 669f6cd..5d233db 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -209,7 +209,7 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	freespace$(EXEEXT) mf$(EXEEXT) farray$(EXEEXT) earray$(EXEEXT) \
 	btree2$(EXEEXT) fheap$(EXEEXT) file_image$(EXEEXT) \
 	unregister$(EXEEXT) cache_logging$(EXEEXT) cork$(EXEEXT) \
-	test_swmr$(EXEEXT)
+	swmr$(EXEEXT)
 @HAVE_SHARED_CONDITIONAL_TRUE@am__EXEEXT_2 = plugin$(EXEEXT)
 am__EXEEXT_3 = gen_bad_ohdr$(EXEEXT) gen_bogus$(EXEEXT) \
 	gen_cross$(EXEEXT) gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
@@ -526,6 +526,10 @@ stab_SOURCES = stab.c
 stab_OBJECTS = stab.$(OBJEXT)
 stab_LDADD = $(LDADD)
 stab_DEPENDENCIES = libh5test.la $(LIBHDF5)
+swmr_SOURCES = swmr.c
+swmr_OBJECTS = swmr.$(OBJEXT)
+swmr_LDADD = $(LDADD)
+swmr_DEPENDENCIES = libh5test.la $(LIBHDF5)
 swmr_addrem_writer_SOURCES = swmr_addrem_writer.c
 swmr_addrem_writer_OBJECTS = swmr_addrem_writer.$(OBJEXT)
 swmr_addrem_writer_LDADD = $(LDADD)
@@ -570,10 +574,6 @@ tcheck_version_SOURCES = tcheck_version.c
 tcheck_version_OBJECTS = tcheck_version.$(OBJEXT)
 tcheck_version_LDADD = $(LDADD)
 tcheck_version_DEPENDENCIES = libh5test.la $(LIBHDF5)
-test_swmr_SOURCES = test_swmr.c
-test_swmr_OBJECTS = test_swmr.$(OBJEXT)
-test_swmr_LDADD = $(LDADD)
-test_swmr_DEPENDENCIES = libh5test.la $(LIBHDF5)
 am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \
 	tattr.$(OBJEXT) tchecksum.$(OBJEXT) tconfig.$(OBJEXT) \
 	tfile.$(OBJEXT) tgenprop.$(OBJEXT) th5o.$(OBJEXT) \
@@ -679,11 +679,11 @@ SOURCES = $(libdynlib1_la_SOURCES) $(libdynlib2_la_SOURCES) \
 	gen_specmetaread.c gen_udlinks.c getname.c gheap.c hyperslab.c \
 	istore.c lheap.c links.c links_env.c mf.c mount.c mtime.c \
 	ntypes.c objcopy.c ohdr.c plugin.c pool.c reserved.c \
-	set_extent.c space_overflow.c stab.c swmr_addrem_writer.c \
-	swmr_check_compat_vfd.c swmr_generator.c swmr_reader.c \
-	swmr_remove_reader.c swmr_remove_writer.c swmr_sparse_reader.c \
-	swmr_sparse_writer.c swmr_start_write.c swmr_writer.c \
-	tcheck_version.c test_swmr.c $(testhdf5_SOURCES) testmeta.c \
+	set_extent.c space_overflow.c stab.c swmr.c \
+	swmr_addrem_writer.c swmr_check_compat_vfd.c swmr_generator.c \
+	swmr_reader.c swmr_remove_reader.c swmr_remove_writer.c \
+	swmr_sparse_reader.c swmr_sparse_writer.c swmr_start_write.c \
+	swmr_writer.c tcheck_version.c $(testhdf5_SOURCES) testmeta.c \
 	$(ttsafe_SOURCES) twriteorder.c unlink.c unregister.c \
 	$(use_append_chunk_SOURCES) $(use_append_mchunks_SOURCES) \
 	$(use_disable_mdc_flushes_SOURCES) vfd.c
@@ -705,11 +705,11 @@ DIST_SOURCES = $(am__libdynlib1_la_SOURCES_DIST) \
 	gen_specmetaread.c gen_udlinks.c getname.c gheap.c hyperslab.c \
 	istore.c lheap.c links.c links_env.c mf.c mount.c mtime.c \
 	ntypes.c objcopy.c ohdr.c plugin.c pool.c reserved.c \
-	set_extent.c space_overflow.c stab.c swmr_addrem_writer.c \
-	swmr_check_compat_vfd.c swmr_generator.c swmr_reader.c \
-	swmr_remove_reader.c swmr_remove_writer.c swmr_sparse_reader.c \
-	swmr_sparse_writer.c swmr_start_write.c swmr_writer.c \
-	tcheck_version.c test_swmr.c $(testhdf5_SOURCES) testmeta.c \
+	set_extent.c space_overflow.c stab.c swmr.c \
+	swmr_addrem_writer.c swmr_check_compat_vfd.c swmr_generator.c \
+	swmr_reader.c swmr_remove_reader.c swmr_remove_writer.c \
+	swmr_sparse_reader.c swmr_sparse_writer.c swmr_start_write.c \
+	swmr_writer.c tcheck_version.c $(testhdf5_SOURCES) testmeta.c \
 	$(ttsafe_SOURCES) twriteorder.c unlink.c unregister.c \
 	$(use_append_chunk_SOURCES) $(use_append_mchunks_SOURCES) \
 	$(use_disable_mdc_flushes_SOURCES) vfd.c
@@ -1257,7 +1257,7 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
            set_extent ttsafe enc_dec_plist enc_dec_plist_with_endianess\
            getname vfd ntypes dangle dtransform reserved cross_read \
            freespace mf farray earray btree2 fheap file_image unregister \
-           cache_logging cork test_swmr
+           cache_logging cork swmr
 
 
 # These programs generate test files for the tests.  They don't need to be
@@ -1760,6 +1760,10 @@ stab$(EXEEXT): $(stab_OBJECTS) $(stab_DEPENDENCIES) $(EXTRA_stab_DEPENDENCIES)
 	@rm -f stab$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(stab_OBJECTS) $(stab_LDADD) $(LIBS)
 
+swmr$(EXEEXT): $(swmr_OBJECTS) $(swmr_DEPENDENCIES) $(EXTRA_swmr_DEPENDENCIES) 
+	@rm -f swmr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(swmr_OBJECTS) $(swmr_LDADD) $(LIBS)
+
 swmr_addrem_writer$(EXEEXT): $(swmr_addrem_writer_OBJECTS) $(swmr_addrem_writer_DEPENDENCIES) $(EXTRA_swmr_addrem_writer_DEPENDENCIES) 
 	@rm -f swmr_addrem_writer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(swmr_addrem_writer_OBJECTS) $(swmr_addrem_writer_LDADD) $(LIBS)
@@ -1804,10 +1808,6 @@ tcheck_version$(EXEEXT): $(tcheck_version_OBJECTS) $(tcheck_version_DEPENDENCIES
 	@rm -f tcheck_version$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tcheck_version_OBJECTS) $(tcheck_version_LDADD) $(LIBS)
 
-test_swmr$(EXEEXT): $(test_swmr_OBJECTS) $(test_swmr_DEPENDENCIES) $(EXTRA_test_swmr_DEPENDENCIES) 
-	@rm -f test_swmr$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_swmr_OBJECTS) $(test_swmr_LDADD) $(LIBS)
-
 testhdf5$(EXEEXT): $(testhdf5_OBJECTS) $(testhdf5_DEPENDENCIES) $(EXTRA_testhdf5_DEPENDENCIES) 
 	@rm -f testhdf5$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testhdf5_OBJECTS) $(testhdf5_LDADD) $(LIBS)
@@ -1935,6 +1935,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_extent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/space_overflow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmr_addrem_writer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmr_check_compat_vfd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmr_common.Plo@am__quote@
@@ -1952,7 +1953,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tchecksum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tconfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcoords.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_swmr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testframe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testhdf5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testmeta.Po@am__quote@
@@ -2576,9 +2576,9 @@ cork.log: cork$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_swmr.log: test_swmr$(EXEEXT)
-	@p='test_swmr$(EXEEXT)'; \
-	b='test_swmr'; \
+swmr.log: swmr$(EXEEXT)
+	@p='swmr$(EXEEXT)'; \
+	b='swmr'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
diff --git a/test/test_swmr.c b/test/swmr.c
index 2aa56b7..2aa56b7 100644
--- a/test/test_swmr.c
+++ b/test/swmr.c