Name all tests consistently

(refactoring)

In brief, the tests naming as follows: all test executable files end
with "test" (not "_test"); all test source files do not have "test"
suffix (except for gctest); test.c is named now as gctest.c.

* CMakeLists.txt: Rename leak_test.c to leak.c; rename huge_test.c to
huge.c; rename leak_test.c to leak.c; rename realloc_test.c to
realloc.c; rename smash_test.c to smash.c; rename staticrootslib.c to
staticroots_lib.c; rename trace_test.c to trace.c; rename
thread_leak_test.c to threadleak.c; rename threadkey_test to
threadkey_test; rename threadkey_test.c to threadkey.c; rename
subthreadcreate_test to subthreadcreatetest; rename subthread_create.c
to subthreadcreate.c; rename initsecondarythread_test to
initfromthreadtest; rename initsecondarythread.c to initfromthread.c;
rename disclaim_test to disclaimtest; rename disclaim_test.c to
disclaim.c; rename disclaim_weakmap_test to weakmaptest; rename
disclaim_weakmap_test.c to weakmap.c.
* tests/tests.am: Likewise.
* CMakeLists.txt: Rename test.c to gctest.c; rename test_cpp to
cpptest; rename test_cpp.cc to cpp.cc.
* Makefile.direct: Likewise.
* NT_MAKEFILE: Likewise.
* README.md (Installation and Portability): Likewise.
* WCC_MAKEFILE: Likewise.
* digimars.mak: Likewise.
* doc/README.Mac: Likewise.
* tests/tests.am: Likewise.
* CMakeLists.txt: rename test_atomic_ops.c to atomicops.c; rename
test_atomic_ops to atomicopstest.
* configure.ac [$with_libatomic_ops=check]: Likewise.
* ChangeLog (8.3.0): Rename threadkey_test to threadkeytest; rename
test_atomic_ops to atomicopstest; rename test_cpp to cpptest.
* Makefile.direct: Rename test.o to gctest.o.
* NT_MAKEFILE: Rename test_cpp.exe to cpptest.exe; rename test.obj to
gctest.obj.
* WCC_MAKEFILE: Likewise.
* digimars.mak: Likewise.
* doc/README.win64: Likewise.
* configure.ac: Rename test_cpp to cpptest in comment.
* doc/leak.md: Rename leak_test.c to leak.c.
* tests/test_atomic_ops.c: Rename to atomicops.c; remove test name in
"skipped" message.
* tests/test_cpp.cc: Rename to cpp.cc; rename test_cpp to cpptest.
* tests/disclaim_test.c: Rename to disclaim.c.
* tests/test.c: Rename to gctest.c.
* tests/huge_test.c: Rename to huge.c.
* tests/initsecondarythread.c: Rename to initfromthread.c.
* tests/leak_test.c: Rename to leak.c.
* tests/realloc_test.c: Rename to realloc.c.
* tests/smash_test.c: Rename to smash.c.
* tests/staticrootstest.c: Rename to staticroots.c.
* tests/staticrootslib.c: Rename to staticroots_lib.c.
* tests/subthread_create.c: Rename to subthreadcreate.c; remove test
name in printed messages.
* tests/threadkey_test.c: Rename to threadkey.c; remove test name in
"skipped" message.
* tests/thread_leak_test.c: Rename to threadleak.c.
* tests/trace_test.c: Rename to trace.c.
* tests/disclaim_weakmap_test.c: Rename to weakmap.c; rename
disclaim_test.c to disclaim.c in comment.

28 files changed, 208 insertions, 218 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d84935fe..57a17a17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -655,10 +655,10 @@ if (build_tests)
 
   # Compile some tests as C++ to test extern "C" in header files.
   if (enable_cplusplus)
-    set_source_files_properties(tests/leak_test.c PROPERTIES LANGUAGE CXX)
+    set_source_files_properties(tests/leak.c PROPERTIES LANGUAGE CXX)
     if (NOT MSVC)
       # WinMain-based test hangs at startup if compiled by VC as C++ code.
-      set_source_files_properties(tests/test.c PROPERTIES LANGUAGE CXX)
+      set_source_files_properties(tests/gctest.c PROPERTIES LANGUAGE CXX)
     endif()
     # To avoid "treating 'c' input as 'c++' when in C++ mode" Clang warning.
     if (NOT (BORLAND OR MSVC OR WATCOM))
@@ -666,7 +666,7 @@ if (build_tests)
     endif()
   endif(enable_cplusplus)
 
-  add_executable(gctest WIN32 tests/test.c ${NODIST_SRC})
+  add_executable(gctest WIN32 tests/gctest.c ${NODIST_SRC})
   target_link_libraries(gctest
                 PRIVATE gc ${ATOMIC_OPS_LIBS_CMAKE} ${THREADDLLIBS_LIST})
   add_test(NAME gctest COMMAND gctest)
@@ -677,11 +677,11 @@ if (build_tests)
                            /wcd=13 /wcd=201 /wcd=367 /wcd=368 /wcd=726)
   endif()
 
-  add_executable(hugetest tests/huge_test.c ${NODIST_SRC})
+  add_executable(hugetest tests/huge.c ${NODIST_SRC})
   target_link_libraries(hugetest PRIVATE gc)
   add_test(NAME hugetest COMMAND hugetest)
 
-  add_executable(leaktest tests/leak_test.c ${NODIST_SRC})
+  add_executable(leaktest tests/leak.c ${NODIST_SRC})
   target_link_libraries(leaktest PRIVATE gc)
   add_test(NAME leaktest COMMAND leaktest)
 
@@ -689,66 +689,63 @@ if (build_tests)
   target_link_libraries(middletest PRIVATE gc)
   add_test(NAME middletest COMMAND middletest)
 
-  add_executable(realloc_test tests/realloc_test.c ${NODIST_SRC})
-  target_link_libraries(realloc_test PRIVATE gc)
-  add_test(NAME realloc_test COMMAND realloc_test)
+  add_executable(realloctest tests/realloc.c ${NODIST_SRC})
+  target_link_libraries(realloctest PRIVATE gc)
+  add_test(NAME realloctest COMMAND realloctest)
 
-  add_executable(smashtest tests/smash_test.c ${NODIST_SRC})
+  add_executable(smashtest tests/smash.c ${NODIST_SRC})
   target_link_libraries(smashtest PRIVATE gc)
   add_test(NAME smashtest COMMAND smashtest)
 
   if (NOT (BUILD_SHARED_LIBS AND WIN32))
-    add_library(staticrootslib_test tests/staticrootslib.c)
-    target_link_libraries(staticrootslib_test PRIVATE gc)
-    add_library(staticrootslib2_test tests/staticrootslib.c)
-    target_compile_options(staticrootslib2_test PRIVATE "-DSTATICROOTSLIB2")
-    target_link_libraries(staticrootslib2_test PRIVATE gc)
-    add_executable(staticrootstest tests/staticrootstest.c ${NODIST_SRC})
+    add_library(staticroots_lib_test tests/staticroots_lib.c)
+    target_link_libraries(staticroots_lib_test PRIVATE gc)
+    add_library(staticroots_lib2_test tests/staticroots_lib.c)
+    target_compile_options(staticroots_lib2_test PRIVATE "-DSTATICROOTSLIB2")
+    target_link_libraries(staticroots_lib2_test PRIVATE gc)
+    add_executable(staticrootstest tests/staticroots.c ${NODIST_SRC})
     target_compile_options(staticrootstest PRIVATE "-DSTATICROOTSLIB2")
     target_link_libraries(staticrootstest PRIVATE
-                          gc staticrootslib_test staticrootslib2_test)
+                          gc staticroots_lib_test staticroots_lib2_test)
     add_test(NAME staticrootstest COMMAND staticrootstest)
   endif()
 
   if (enable_gc_debug)
-    add_executable(tracetest tests/trace_test.c ${NODIST_SRC})
+    add_executable(tracetest tests/trace.c ${NODIST_SRC})
     target_link_libraries(tracetest PRIVATE gc)
     add_test(NAME tracetest COMMAND tracetest)
   endif()
 
   if (enable_threads)
-    add_executable(test_atomic_ops tests/test_atomic_ops.c ${NODIST_SRC})
-    target_link_libraries(test_atomic_ops
+    add_executable(atomicopstest tests/atomicops.c ${NODIST_SRC})
+    target_link_libraries(atomicopstest
                 PRIVATE ${ATOMIC_OPS_LIBS_CMAKE} ${THREADDLLIBS_LIST})
-    add_test(NAME test_atomic_ops COMMAND test_atomic_ops)
+    add_test(NAME atomicopstest COMMAND atomicopstest)
 
-    add_executable(threadleaktest tests/thread_leak_test.c ${NODIST_SRC})
+    add_executable(initfromthreadtest tests/initfromthread.c ${NODIST_SRC})
+    target_link_libraries(initfromthreadtest PRIVATE gc ${THREADDLLIBS_LIST})
+    add_test(NAME initfromthreadtest COMMAND initfromthreadtest)
+
+    add_executable(subthreadcreatetest tests/subthreadcreate.c ${NODIST_SRC})
+    target_link_libraries(subthreadcreatetest
+                PRIVATE gc ${ATOMIC_OPS_LIBS_CMAKE} ${THREADDLLIBS_LIST})
+    add_test(NAME subthreadcreatetest COMMAND subthreadcreatetest)
+
+    add_executable(threadleaktest tests/threadleak.c ${NODIST_SRC})
     target_link_libraries(threadleaktest PRIVATE gc ${THREADDLLIBS_LIST})
     add_test(NAME threadleaktest COMMAND threadleaktest)
 
     if (NOT WIN32)
-      add_executable(threadkey_test tests/threadkey_test.c ${NODIST_SRC})
-      target_link_libraries(threadkey_test PRIVATE gc ${THREADDLLIBS_LIST})
-      add_test(NAME threadkey_test COMMAND threadkey_test)
+      add_executable(threadkeytest tests/threadkey.c ${NODIST_SRC})
+      target_link_libraries(threadkeytest PRIVATE gc ${THREADDLLIBS_LIST})
+      add_test(NAME threadkeytest COMMAND threadkeytest)
     endif()
-
-    add_executable(subthreadcreate_test
-                   tests/subthread_create.c ${NODIST_SRC})
-    target_link_libraries(subthreadcreate_test
-                PRIVATE gc ${ATOMIC_OPS_LIBS_CMAKE} ${THREADDLLIBS_LIST})
-    add_test(NAME subthreadcreate_test COMMAND subthreadcreate_test)
-
-    add_executable(initsecondarythread_test
-                   tests/initsecondarythread.c ${NODIST_SRC})
-    target_link_libraries(initsecondarythread_test
-                          PRIVATE gc ${THREADDLLIBS_LIST})
-    add_test(NAME initsecondarythread_test COMMAND initsecondarythread_test)
   endif(enable_threads)
 
   if (enable_cplusplus)
-    add_executable(test_cpp WIN32 tests/test_cpp.cc ${NODIST_SRC})
-    target_link_libraries(test_cpp PRIVATE gc gccpp)
-    add_test(NAME test_cpp COMMAND test_cpp)
+    add_executable(cpptest WIN32 tests/cpp.cc ${NODIST_SRC})
+    target_link_libraries(cpptest PRIVATE gc gccpp)
+    add_test(NAME cpptest COMMAND cpptest)
   endif()
 
   if (enable_disclaim)
@@ -756,15 +753,14 @@ if (build_tests)
     target_link_libraries(disclaim_bench PRIVATE gc)
     add_test(NAME disclaim_bench COMMAND disclaim_bench)
 
-    add_executable(disclaim_test tests/disclaim_test.c ${NODIST_SRC})
-    target_link_libraries(disclaim_test PRIVATE gc ${THREADDLLIBS_LIST})
-    add_test(NAME disclaim_test COMMAND disclaim_test)
+    add_executable(disclaimtest tests/disclaim.c ${NODIST_SRC})
+    target_link_libraries(disclaimtest PRIVATE gc ${THREADDLLIBS_LIST})
+    add_test(NAME disclaimtest COMMAND disclaimtest)
 
-    add_executable(disclaim_weakmap_test
-                   tests/disclaim_weakmap_test.c ${NODIST_SRC})
-    target_link_libraries(disclaim_weakmap_test
+    add_executable(weakmaptest tests/weakmap.c ${NODIST_SRC})
+    target_link_libraries(weakmaptest
                 PRIVATE gc ${ATOMIC_OPS_LIBS_CMAKE} ${THREADDLLIBS_LIST})
-    add_test(NAME disclaim_weakmap_test COMMAND disclaim_weakmap_test)
+    add_test(NAME weakmaptest COMMAND weakmaptest)
   endif()
 endif(build_tests)
 
diff --git a/ChangeLog b/ChangeLog
index 51960d25..37fc31d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@
 * Do not put atomic_ops[_sysdeps].o to libgc.a in Makefile.direct
 * Do not treat warnings as errors by default in digimars.mak
 * Enable without_libatomic_ops for targets requiring atomic_ops.c (CMake)
-* Fail threadkey_test on pthread_create error in main loop
+* Fail threadkeytest on pthread_create error in main loop
 * Fix digimars.mak to build 'all' by default
 * Make all functions static in msvc_dbg.c except for backtrace[_symbols]
 * Mention CMake-based build in README.md and README.QUICK
@@ -25,7 +25,7 @@
 * Print iteration number on thread creation or join failure in tests
 * Print thread number on marker thread creation failure
 * Put gc_badalc/cpp.cpp instead of .cc ones in CMake script (MSVC/BCC/WCC)
-* Relax required dependencies for test_atomic_ops (CMake)
+* Relax required dependencies for atomicopstest (CMake)
 * Remove GC_copyright symbol
 * Remove IF_IA64 macro in pthread_stop_world (refactoring)
 * Remove Symbian makefile
@@ -38,7 +38,7 @@
 * State explicitly that license is MIT-style
 * Support CFLAGS_EXTRA in rare build scripts (NT/WCC_MAKEFILE, digimars.mak)
 * Try find libatomic_ops installed by cmake if with_libatomic_ops (CMake)
-* Use GC_printf in test_cpp consistently (refactoring)
+* Use GC_printf in cpptest consistently (refactoring)
 
 
 == [8.2.2] (not released yet) ==
diff --git a/Makefile.direct b/Makefile.direct
index 366812fb..284d87f1 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -180,7 +180,7 @@ BSD-pkg-install: BSD-pkg-all
 	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
 	${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
 
-$(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \
+$(OBJS) tests/gctest.o dyn_load.o dyn_load_sunos53.o: \
   $(srcdir)/include/private/gc_priv.h \
   $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \
   $(srcdir)/include/gc.h $(srcdir)/include/gc/gc_pthread_redirects.h \
@@ -196,10 +196,10 @@ specific.o pthread_support.o thread_local_alloc.o win32_threads.o: \
 
 dbg_mlc.o gcj_mlc.o: $(srcdir)/include/private/dbg_mlc.h
 
-tests/test.o: $(srcdir)/tests/test.c
+tests/gctest.o: $(srcdir)/tests/gctest.c
 	mkdir tests || cat /dev/null
-	$(CC) $(CFLAGS) -c $(srcdir)/tests/test.c
-	mv test.o tests/test.o
+	$(CC) $(CFLAGS) -c $(srcdir)/tests/gctest.c
+	mv gctest.o tests/gctest.o
 
 base_lib libgc.a: $(OBJS) dyn_load.o $(UTILS)
 	rm -f dont_ar_1
@@ -230,22 +230,22 @@ gc_badalc.o: $(srcdir)/gc_badalc.cc $(srcdir)/include/gc_cpp.h \
 gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h
 	$(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc
 
-test_cpp$(EXEEXT): $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h \
+cpptest$(EXEEXT): $(srcdir)/tests/cpp.cc $(srcdir)/include/gc_cpp.h \
   $(srcdir)/include/gc.h c++ base_lib $(NODIST_OBJS) $(UTILS)
-	rm -f test_cpp$(EXEEXT)
-	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc $(NODIST_OBJS) libgc.a libgccpp.a -ldld `./threadlibs`
-	./if_not_there test_cpp$(EXEEXT) || $(CXX) $(CXXFLAGS) -DGC_NOT_DLL -o test_cpp$(EXEEXT) $(srcdir)/tests/test_cpp.cc $(NODIST_OBJS) libgc.a libgccpp.a `./threadlibs`
+	rm -f cpptest$(EXEEXT)
+	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o cpptest $(srcdir)/tests/cpp.cc $(NODIST_OBJS) libgc.a libgccpp.a -ldld `./threadlibs`
+	./if_not_there cpptest$(EXEEXT) || $(CXX) $(CXXFLAGS) -DGC_NOT_DLL -o cpptest$(EXEEXT) $(srcdir)/tests/cpp.cc $(NODIST_OBJS) libgc.a libgccpp.a `./threadlibs`
 
-check-cpp-deps: test_cpp$(EXEEXT)
+check-cpp-deps: cpptest$(EXEEXT)
 
 check-cpp: check-cpp-deps
-	./test_cpp
+	./cpptest
 
-c++-t: c++ test_cpp$(EXEEXT)
-	./test_cpp 1
+c++-t: c++ cpptest$(EXEEXT)
+	./cpptest 1
 
 c++-nt: c++
-	@echo "Use ./test_cpp 1 to test the leak library"
+	@echo "Use ./cpptest 1 to test the leak library"
 
 c++ libgccpp.a libgctba.a: gc_badalc.o gc_cpp.o $(UTILS)
 	rm -f dont_ar_4
@@ -286,7 +286,7 @@ liblinuxgc.so: $(OBJS) $(NODIST_OBJS) dyn_load.o
 
 # Build gctest with dynamic library
 dyn_test:
-	$(CC) $(CFLAGS) -o gctest$(EXEEXT) tests/test.c libgc.so `./threadlibs`
+	$(CC) $(CFLAGS) -o gctest$(EXEEXT) tests/gctest.c libgc.so `./threadlibs`
 	./gctest
 
 mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \
@@ -363,17 +363,17 @@ if_not_there$(EXEEXT): $(srcdir)/tools/if_not_there.c
 	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there$(EXEEXT) $(srcdir)/tools/if_not_there.c
 
 clean:
-	rm -f *.a *.i *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
+	rm -f *.a *.i *.o *.exe tests/*.o cpptest gctest gctest_dyn_link \
 	      setjmp_test mon.out gmon.out a.out core if_not_there if_mach \
 	      base_lib c++ $(CORD_OBJS) cordtest de cords dont_ar_* threadlibs
 	-rm -f *~
 
-gctest$(EXEEXT): tests/test.o base_lib $(NODIST_OBJS) $(UTILS)
+gctest$(EXEEXT): tests/gctest.o base_lib $(NODIST_OBJS) $(UTILS)
 	rm -f gctest$(EXEEXT)
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest tests/test.o $(NODIST_OBJS) libgc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest tests/test.o $(NODIST_OBJS) libgc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest tests/test.o $(NODIST_OBJS) libgc.a `./threadlibs`
-	./if_not_there gctest$(EXEEXT) || $(CC) $(CFLAGS) -o gctest$(EXEEXT) tests/test.o $(NODIST_OBJS) libgc.a `./threadlibs`
+	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest tests/gctest.o $(NODIST_OBJS) libgc.a -lucb
+	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest tests/gctest.o $(NODIST_OBJS) libgc.a -ldld `./threadlibs`
+	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest tests/gctest.o $(NODIST_OBJS) libgc.a `./threadlibs`
+	./if_not_there gctest$(EXEEXT) || $(CC) $(CFLAGS) -o gctest$(EXEEXT) tests/gctest.o $(NODIST_OBJS) libgc.a `./threadlibs`
 
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  gctest may still work.
@@ -383,13 +383,13 @@ setjmp_test$(EXEEXT): $(srcdir)/tools/setjmp_t.c $(srcdir)/include/gc.h \
 	$(CC) $(CFLAGS) -o setjmp_test$(EXEEXT) $(srcdir)/tools/setjmp_t.c
 
 check-deps: cordtest$(EXEEXT) gctest$(EXEEXT) setjmp_test$(EXEEXT) \
-  test_cpp$(EXEEXT)
+  cpptest$(EXEEXT)
 
 check: check-deps
 	./setjmp_test
 	./gctest
 	./cordtest
-	./test_cpp
+	./cpptest
 
 # A synonym to "check" (for compatibility with older GC versions).
 test: check
@@ -398,22 +398,22 @@ test: check
 # Currently works only under SunOS5.  Requires GC_INIT call from statically
 # loaded client code.
 ABSDIR= `pwd`
-gctest_dyn_link: tests/test.o libgc.so
-	$(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link tests/test.o -lgc -ldl -lthread
+gctest_dyn_link: tests/gcgctest.o libgc.so
+	$(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link tests/gctest.o -lgc -ldl -lthread
 
-gctest_irix_dyn_link: tests/test.o libirixgc.so
-	$(CC) -L$(ABSDIR) -o gctest_irix_dyn_link tests/test.o -lirixgc
+gctest_irix_dyn_link: tests/gctest.o libirixgc.so
+	$(CC) -L$(ABSDIR) -o gctest_irix_dyn_link tests/gctest.o -lirixgc
 
 SYM_PREFIX-libgc=GC
 
 reserved_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
+	for file in $(SRCS) tests/gctest.c tests/cpp.cc; do \
 		sed s/GC_/_GC_/g < $$file > tmp; \
 		cp tmp $$file; \
 		done
 
 user_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
+	for file in $(SRCS) tests/gctest.c tests/cpp.cc; do \
 		sed s/_GC_/GC_/g < $$file > tmp; \
 		cp tmp $$file; \
 		done
diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index c3a77f7d..0a1a4428 100644
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -103,12 +103,12 @@ COBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj
 
 all: gc.lib cord.lib gccpp.lib gctba.lib
 
-check-deps: gctest.exe test_cpp.exe cordtest.exe de.exe
+check-deps: gctest.exe cpptest.exe cordtest.exe de.exe
 
 check: check-deps
 	gctest.exe
 	cordtest.exe
-	test_cpp.exe
+	cpptest.exe
 
 .c.obj:
 	$(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) $(CORDFLAG) -Iinclude -I$(AO_INCLUDE_DIR) $(CFLAGS_DEFAULT) -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS_EXTRA) $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701
@@ -118,7 +118,7 @@ check: check-deps
 .cpp.obj:
 	$(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude $(CFLAGS_DEFAULT) $(CXXFLAGS_SPECIFIC) -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS_EXTRA) $*.cpp /Fo$*.obj
 
-$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc\gc_mark.h include\gc\gc_disclaim.h
+$(OBJS) tests\gctest.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc\gc_mark.h include\gc\gc_disclaim.h
 
 !IFDEF ENABLE_STATIC
 
@@ -151,8 +151,8 @@ gctba.lib: gc_badalc.obj gc.lib
 
 !ENDIF
 
-gctest.exe: gc.lib tests\test.obj
-	$(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) user32.lib -out:$*.exe tests\test.obj gc.lib
+gctest.exe: gc.lib tests\gctest.obj
+	$(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) user32.lib -out:$*.exe tests\gctest.obj gc.lib
 #	mapsympe -n -o gctest.sym gctest.exe
 # This produces a GUI app that opens no window and writes to gctest.gc.log.
 
@@ -175,14 +175,14 @@ gc_badalc.obj: gc_badalc.cc include\gc_cpp.h include\gc.h
 
 gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h
 
-test_cpp.cpp: tests\test_cpp.cc
-	copy tests\test_cpp.cc test_cpp.cpp
+test_cpp.cpp: tests\cpp.cc
+	copy tests\cpp.cc test_cpp.cpp
 
 # This generates the C++ test executable.  The executable expects
 # a single numeric argument, which is the number of iterations.
-# The output appears in test_cpp.gc.log file.
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib gccpp.lib
-	$(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) user32.lib -out:test_cpp.exe test_cpp.obj gc.lib gccpp.lib
+# The output appears in cpptest.gc.log file.
+cpptest.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib gccpp.lib
+	$(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) user32.lib -out:cpptest.exe test_cpp.obj gc.lib gccpp.lib
 
 $(AO_SRC_DIR):
 	tar xvfz $(AO_SRC_DIR).tar.gz
diff --git a/README.md b/README.md
index da7a51c4..87797f0a 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ will result in a few lines of descriptive output for each collection.
 (The given statistics exhibit a few peculiarities.
 Things don't appear to add up for a variety of reasons, most notably
 fragmentation losses.  These are probably much more significant for the
-contrived program `tests/test.c` than for your application.)
+contrived program `gctest` than for your application.)
 
 On most Unix-like platforms, the collector can be built either using a
 GNU autoconf-based build infrastructure (type `./configure; make` in the
@@ -218,7 +218,7 @@ See [README.cmake](doc/README.cmake) for details.
 Finally, on most targets, the collector could be built and tested directly
 with a single compiler invocation, like this:
 
-    gcc -I include -o gctest tests/test.c extra/gc.c && ./gctest
+    gcc -I include -o gctest tests/gctest.c extra/gc.c && ./gctest
 
 On Windows, CMake could be used to build the library as described above or
 by typing `nmake -f NT_MAKEFILE`, this assumes you have Microsoft command-line
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index 57dccbdb..337ca19d 100644
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -83,11 +83,11 @@ COBJS= cordbscs.obj cordxtra.obj cordprnt.obj
 
 all: gc.lib gccpp.lib gctba.lib cord.lib
 
-check-deps: gctest.exe test_cpp.exe cordtest.exe .SYMBOLIC
+check-deps: gctest.exe cpptest.exe cordtest.exe .SYMBOLIC
 
 check: check-deps .SYMBOLIC
         *gctest.exe
-        *test_cpp.exe
+        *cpptest.exe
         *cordtest.exe
 
 !ifdef ENABLE_STATIC
@@ -201,7 +201,7 @@ gctba.dll: gc_badalc.obj gc.lib .AUTODEPEND
 
 !endif
 
-gctest.exe: test.obj gc.lib
+gctest.exe: gctest.obj gc.lib
         %create $*.lnk
 !ifdef DOS4GW
         @%append $*.lnk sys dos4g
@@ -213,7 +213,7 @@ gctest.exe: test.obj gc.lib
         @%append $*.lnk op case
         @%append $*.lnk op stack=256K
         @%append $*.lnk name $*
-        @%append $*.lnk file test.obj
+        @%append $*.lnk file gctest.obj
         @%append $*.lnk library gc.lib
         *wlink @$*.lnk
 
@@ -234,7 +234,7 @@ cordtest.exe: cordtest.obj gc.lib cord.lib
         @%append $*.lnk library cord.lib
         *wlink @$*.lnk
 
-test_cpp.exe: test_cpp.obj gc.lib gccpp.lib
+cpptest.exe: cpptest.obj gc.lib gccpp.lib
         %create $*.lnk
 !ifdef DOS4GW
         @%append $*.lnk sys dos4g
@@ -246,7 +246,7 @@ test_cpp.exe: test_cpp.obj gc.lib gccpp.lib
         @%append $*.lnk op case
         @%append $*.lnk op stack=256K
         @%append $*.lnk name $*
-        @%append $*.lnk file test_cpp.obj
+        @%append $*.lnk file cpptest.obj
         @%append $*.lnk library gc.lib
         @%append $*.lnk library gccpp.lib
         *wlink @$*.lnk
@@ -263,12 +263,12 @@ gc_badalc.obj: gc_badalc.cc .AUTODEPEND
 gc_cpp.obj: gc_cpp.cc .AUTODEPEND
         $(CXX) $(TEST_CXXFLAGS) $*.cc
 
-test.obj: tests\test.c .AUTODEPEND
-        $(CC) $(TEST_CFLAGS) /wcd=13 /wcd=201 /wcd=367 /wcd=368 tests\test.c
+gctest.obj: tests\gctest.c .AUTODEPEND
+        $(CC) $(TEST_CFLAGS) /wcd=13 /wcd=201 /wcd=367 /wcd=368 tests\gctest.c
 cordtest.obj: cord\tests\cordtest.c .AUTODEPEND
         $(CC) $(TEST_CFLAGS) $(CORDFLAG) cord\tests\cordtest.c
-test_cpp.obj: tests\test_cpp.cc .AUTODEPEND
-        $(CXX) $(TEST_CXXFLAGS) tests\test_cpp.cc
+cpptest.obj: tests\cpp.cc .AUTODEPEND
+        $(CXX) $(TEST_CXXFLAGS) -fo=cpptest.obj tests\cpp.cc
 
 .c.obj: .AUTODEPEND
         $(CC) $(CFLAGS) $*.c
diff --git a/configure.ac b/configure.ac
index 7ccca2ea..0962f51f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -565,7 +565,7 @@ else
       # Do not require the clients to link with "user32" system library.
       AC_DEFINE([DONT_USE_USER32_DLL], 1,
                 [Do not use user32.dll import library (Win32).])
-      # Use inline version of GC new and delete operators in test_cpp
+      # Use inline version of GC new and delete operators in cpptest
       # otherwise the system ones might be used instead because of arbitrary
       # ordering of object files when linking.
       CXXFLAGS="$CXXFLAGS -DGC_NOT_DLL"
@@ -1009,7 +1009,7 @@ AC_ARG_ENABLE(gcov,
 if test "$enable_gcov" = "yes"; then
   CFLAGS="-D NTHREADS=20 $CFLAGS --coverage"
   if test "${enable_shared}" = no; then
-    # FIXME: As of g++-4.8.4/x86_64, in case of shared library build, test_cpp
+    # FIXME: As of g++-4.8.4/x86_64, in case of shared library build, cpptest
     # linkage fails with "hidden symbol atexit is referenced by DSO" message.
     CXXFLAGS="$CXXFLAGS --coverage"
   fi
@@ -1042,8 +1042,8 @@ if test x"$with_libatomic_ops" = xcheck; then
   AC_MSG_CHECKING(for compiler intrinsics support)
   old_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $CFLAGS_EXTRA -DGC_BUILTIN_ATOMIC"
-  CFLAGS="$CFLAGS -I${srcdir}/include -I${srcdir}/tests"
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[#include "test_atomic_ops.c"]])],
+  CFLAGS="$CFLAGS -I${srcdir}/include -I${srcdir}"
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[#include "tests/atomicops.c"]])],
     [AC_MSG_RESULT(yes)
      with_libatomic_ops=none],
     [AC_MSG_RESULT(no)], [AC_MSG_RESULT(skipped because cross-compiling)])
diff --git a/digimars.mak b/digimars.mak
index dc56a524..2daab07b 100644
--- a/digimars.mak
+++ b/digimars.mak
@@ -21,9 +21,9 @@ gc.obj: extra\gc.c
 

 OBJS= gc.obj gc_badalc.obj gc_cpp.obj

 

-check: gctest.exe test_cpp.exe

+check: gctest.exe cpptest.exe

 	gctest.exe

-	test_cpp.exe

+	cpptest.exe

 

 gc.lib: gc.dll

 

@@ -39,21 +39,21 @@ gc.def: digimars.mak
 	echo GC_is_valid_displacement_print_proc >>gc.def

 

 clean:

-	del *.log gc.def gc.dll gc.lib gc.map gctest.map test_cpp.map

-	del tests\test.obj gctest.exe tests\test_cpp.obj test_cpp.exe

+	del *.log gc.def gc.dll gc.lib gc.map gctest.map cpptest.map

+	del tests\gctest.obj gctest.exe tests\cpptest.obj cpptest.exe

 	del $(OBJS)

 

-gctest.exe: gc.lib tests\test.obj

-	$(CC) -ogctest.exe tests\test.obj gc.lib

+gctest.exe: gc.lib tests\gctest.obj

+	$(CC) -ogctest.exe tests\gctest.obj gc.lib

 

-tests\test.obj: tests\test.c

-	$(CC) -c $(CFLAGS) tests\test.c -otests\test.obj

+tests\gctest.obj: tests\gctest.c

+	$(CC) -c $(CFLAGS) tests\gctest.c -otests\gctest.obj

 

-test_cpp.exe: gc.lib tests\test_cpp.obj

-	$(CC) -otest_cpp.exe tests\test_cpp.obj gc.lib

+cpptest.exe: gc.lib tests\cpptest.obj

+	$(CC) -ocpptest.exe tests\cpptest.obj gc.lib

 

-tests\test_cpp.obj: tests\test_cpp.cc

-	$(CC) -c $(CFLAGS) -cpp tests\test_cpp.cc -otests\test_cpp.obj

+tests\cpptest.obj: tests\cpp.cc

+	$(CC) -c $(CFLAGS) -cpp tests\cpp.cc -otests\cpptest.obj

 

 gc_badalc.obj: gc_badalc.cc gc_badalc.cpp

 gc_cpp.obj: gc_cpp.cc gc_cpp.cpp

diff --git a/doc/README.Mac b/doc/README.Mac
index 83c1c19f..100746b1 100644
--- a/doc/README.Mac
+++ b/doc/README.Mac
@@ -53,8 +53,8 @@ As for target settings the major obstacles may be:
 
 What you need to do:
 1) Build the GC as a library
-2) Test that the library works with 'test.c'.
-3) Test that the C++ interface 'gc_cpp.cc/h' works with 'test_cpp.cc'.
+2) Test that the library works with 'gctest.c'.
+3) Test that the C++ interface 'gc_cpp.h' works with 'tests/cpp.cc'.
 
 == 1. The Libraries ==
 
@@ -198,14 +198,14 @@ Files to build the GC libraries:
     gc_badalc.cc
     gc_cpp.cc
 
-== 2. Test that the library works with 'test.c' ==
+== 2. Test that the library works with 'gctest.c' ==
 
 The test app is just an ordinary ANSI-C console app. Make sure settings
 match the library you're testing.
 
 Files
 -----
-    test.c
+    gctest.c
     the GC library to test        -- link order before ANSI libs
     suitable Mac+ANSI libraries
 
@@ -219,23 +219,23 @@ prefix:
 #define ALL_INTERIOR_POINTERS   /* for GC_priv.h */
 ---- ( cut here ) ----
 
-== 3. Test that the C++ interface 'gc_cpp.cc/h' works with 'test_cpp.cc' ==
+== 3. Test that the C++ interface 'gc_cpp.h' works with 'tests/cpp.cc' ==
 
 The test app is just an ordinary ANSI-C console app. Make sure settings match
 the library you're testing.
 
 Files
 -----
-    test_cpp.cc
+    tests/cpp.cc
     the GC library to test        -- link order before ANSI libs
     suitable Mac+ANSI libraries
 
 prefix:
 ------
-same as for test.c
+same as for gctest.c
 
 For convenience I used one test-project with several targets so that all
-test apps are build at once. Two for each library to test: test.c and
+test apps are build at once. Two for each library to test: gctest.c and
 gc_app.cc. When I was satisfied that the libraries were OK. I put the
 libraries + gc.h + the c++ interface-file in a folder that I then put into
 the MSL hierarchy so that I don't have to alter access-paths in projects
diff --git a/doc/README.win64 b/doc/README.win64
index c2270c5b..eb6e7cd6 100644
--- a/doc/README.win64
+++ b/doc/README.win64
@@ -9,7 +9,7 @@ To verify that the collector is at least somewhat functional,
 type "nmake -f NT_MAKEFILE cpu=AMD64 check" to build and run the usual test
 programs.  This should create gctest.gc.log after a few seconds.
 
-Test_cpp.exe might not run correctly in case of dynamic GC linking.  (It seems
+cpptest.exe might not run correctly in case of dynamic GC linking.  (It seems
 that we're getting wrong instances of operator new/delete in some cases.)
 
 This process is completely analogous to NT_MAKEFILE usage
diff --git a/doc/leak.md b/doc/leak.md
index 9d5f32ba..4b7bf2a4 100644
--- a/doc/leak.md
+++ b/doc/leak.md
@@ -70,14 +70,14 @@ distribution.
 Assume the collector has been built with `-DFIND_LEAK` or
 `GC_set_find_leak(1)` exists as the first statement in `main`.
 
-The program to be tested for leaks could look like `tests/leak_test.c` file
+The program to be tested for leaks could look like `tests/leak.c` file
 of the distribution.
 
 On an Intel X86 Linux system this produces on the stderr stream:
 
 
     Found 1 leaked objects:
-    0x806dff0 (tests/leak_test.c:19, sz=4, NORMAL)
+    0x806dff0 (tests/leak.c:19, sz=4, NORMAL)
 
 
 (On most unmentioned operating systems, the output is similar to this. If the
@@ -89,7 +89,7 @@ On Irix it reports:
 
 
     Found 1 leaked objects:
-    0x10040fe0 (tests/leak_test.c:19, sz=4, NORMAL)
+    0x10040fe0 (tests/leak.c:19, sz=4, NORMAL)
             Caller at allocation:
                     ##PC##= 0x10004910
 
@@ -98,7 +98,7 @@ and on Solaris the error report is:
 
 
     Found 1 leaked objects:
-    0xef621fc8 (tests/leak_test.c:19, sz=4, NORMAL)
+    0xef621fc8 (tests/leak.c:19, sz=4, NORMAL)
             Call chain at allocation:
                     args: 4 (0x4), 200656 (0x30FD0)
                     ##PC##= 0x14ADC
diff --git a/tests/test_atomic_ops.c b/tests/atomicops.c
index 23bb405b..2ff6c785 100644
--- a/tests/test_atomic_ops.c
+++ b/tests/atomicops.c
@@ -91,7 +91,7 @@
 
   int main(void)
   {
-    printf("test_atomic_ops skipped\n");
+    printf("test skipped\n");
     return 0;
   }
 
diff --git a/tests/test_cpp.cc b/tests/cpp.cc
index 84ab96ca..05abc29e 100644
--- a/tests/test_cpp.cc
+++ b/tests/cpp.cc
@@ -11,14 +11,9 @@
  * modified is included with the above copyright notice.
  */
 
-/****************************************************************************
-usage: test_cpp number-of-iterations
-
-This program tries to test the specific C++ functionality provided by
-gc_cpp.h that isn't tested by the more general test routines of the
-collector.
-
-***************************************************************************/
+// This program tries to test the specific C++ functionality provided by
+// gc_cpp.h that isn't tested by the more general test routines of the
+// collector.
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -282,7 +277,7 @@ void* Undisguise( GC_word i ) {
       }
 #elif defined(MACOS)
   int main() {
-    char* argv_[] = {"test_cpp", "7"}; // MacOS doesn't have a command line
+    char* argv_[] = {"cpptest", "7"}; // MacOS doesn't have a command line
     argv = argv_;
     argc = sizeof(argv_)/sizeof(argv_[0]);
 #else
@@ -317,7 +312,7 @@ void* Undisguise( GC_word i ) {
     x = 0;
     if (argc != 2
         || (n = atoi(argv[1])) <= 0) {
-      GC_printf("usage: test_cpp number-of-iterations\n"
+      GC_printf("usage: cpptest <number-of-iterations>\n"
                 "Assuming %d iterations\n", N_TESTS);
       n = N_TESTS;
     }
diff --git a/tests/disclaim_test.c b/tests/disclaim.c
index 50f9e4da..50f9e4da 100644
--- a/tests/disclaim_test.c
+++ b/tests/disclaim.c
diff --git a/tests/test.c b/tests/gctest.c
index 3a37a6dd..3a37a6dd 100644
--- a/tests/test.c
+++ b/tests/gctest.c
diff --git a/tests/huge_test.c b/tests/huge.c
index 9242d319..9242d319 100644
--- a/tests/huge_test.c
+++ b/tests/huge.c
diff --git a/tests/initsecondarythread.c b/tests/initfromthread.c
index 9f008267..9f008267 100644
--- a/tests/initsecondarythread.c
+++ b/tests/initfromthread.c
diff --git a/tests/leak_test.c b/tests/leak.c
index b54b3227..b54b3227 100644
--- a/tests/leak_test.c
+++ b/tests/leak.c
diff --git a/tests/realloc_test.c b/tests/realloc.c
index 3af19d63..3af19d63 100644
--- a/tests/realloc_test.c
+++ b/tests/realloc.c
diff --git a/tests/smash_test.c b/tests/smash.c
index d83827fb..d83827fb 100644
--- a/tests/smash_test.c
+++ b/tests/smash.c
diff --git a/tests/staticrootstest.c b/tests/staticroots.c
index cc0790b1..cac863da 100644
--- a/tests/staticrootstest.c
+++ b/tests/staticroots.c
@@ -13,7 +13,7 @@
 # define GC_TEST_IMPORT_API extern
 #endif
 
-/* Should match that in staticrootslib.c.       */
+/* Should match that in staticroots_lib.c.      */
 struct treenode {
     struct treenode *x;
     struct treenode *y;
diff --git a/tests/staticrootslib.c b/tests/staticroots_lib.c
index 5275ec8b..5275ec8b 100644
--- a/tests/staticrootslib.c
+++ b/tests/staticroots_lib.c
diff --git a/tests/subthread_create.c b/tests/subthreadcreate.c
index 30f31819..e3a3c128 100644
--- a/tests/subthread_create.c
+++ b/tests/subthreadcreate.c
@@ -167,7 +167,7 @@ int main(void)
 #     endif
     }
 #endif
-  printf("subthread_create: created %d threads (%d ended)\n",
+  printf("Created %d threads (%d ended)\n",
          (int)AO_load(&thread_created_cnt), (int)AO_load(&thread_ended_cnt));
   return 0;
 }
@@ -176,7 +176,7 @@ int main(void)
 
 int main(void)
 {
-  printf("subthread_create test skipped\n");
+  printf("test skipped\n");
   return 0;
 }
 
diff --git a/tests/tests.am b/tests/tests.am
index e7c5318b..0523e868 100644
--- a/tests/tests.am
+++ b/tests/tests.am
@@ -14,7 +14,7 @@ test_ldadd = $(nodist_libgc_la_OBJECTS) $(top_builddir)/libgc.la \
 
 TESTS += gctest$(EXEEXT)
 check_PROGRAMS += gctest
-gctest_SOURCES = tests/test.c
+gctest_SOURCES = tests/gctest.c
 gctest_LDADD = $(test_ldadd)
 if THREADS
 if ENABLE_SHARED
@@ -35,9 +35,14 @@ gctest_html_LDADD = $(gctest_LDADD)
 gctest_html_LDFLAGS = -s "EXPORTED_FUNCTIONS=['_memalign', '_main', '_memset']"
 endif
 
+TESTS += hugetest$(EXEEXT)
+check_PROGRAMS += hugetest
+hugetest_SOURCES = tests/huge.c
+hugetest_LDADD = $(test_ldadd)
+
 TESTS += leaktest$(EXEEXT)
 check_PROGRAMS += leaktest
-leaktest_SOURCES = tests/leak_test.c
+leaktest_SOURCES = tests/leak.c
 leaktest_LDADD = $(test_ldadd)
 
 TESTS += middletest$(EXEEXT)
@@ -45,36 +50,31 @@ check_PROGRAMS += middletest
 middletest_SOURCES = tests/middle.c
 middletest_LDADD = $(test_ldadd)
 
+TESTS += realloctest$(EXEEXT)
+check_PROGRAMS += realloctest
+realloctest_SOURCES = tests/realloc.c
+realloctest_LDADD = $(test_ldadd)
+
 TESTS += smashtest$(EXEEXT)
 check_PROGRAMS += smashtest
-smashtest_SOURCES = tests/smash_test.c
+smashtest_SOURCES = tests/smash.c
 smashtest_LDADD = $(test_ldadd)
 
-TESTS += hugetest$(EXEEXT)
-check_PROGRAMS += hugetest
-hugetest_SOURCES = tests/huge_test.c
-hugetest_LDADD = $(test_ldadd)
-
-TESTS += realloc_test$(EXEEXT)
-check_PROGRAMS += realloc_test
-realloc_test_SOURCES = tests/realloc_test.c
-realloc_test_LDADD = $(test_ldadd)
-
 TESTS += staticrootstest$(EXEEXT)
 check_PROGRAMS += staticrootstest
-staticrootstest_SOURCES = tests/staticrootstest.c
+staticrootstest_SOURCES = tests/staticroots.c
 staticrootstest_CFLAGS = -DSTATICROOTSLIB2
 staticrootstest_LDADD = $(nodist_libgc_la_OBJECTS) $(EXTRA_TEST_LIBS) \
-                        libstaticrootslib_test.la libstaticrootslib2_test.la
-check_LTLIBRARIES += libstaticrootslib_test.la libstaticrootslib2_test.la
-libstaticrootslib_test_la_SOURCES = tests/staticrootslib.c
-libstaticrootslib_test_la_LIBADD = $(test_ldadd)
-libstaticrootslib_test_la_LDFLAGS = -no-undefined -rpath /nowhere
-libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libgc.la
-libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c
-libstaticrootslib2_test_la_LIBADD = $(test_ldadd)
-libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2
-libstaticrootslib2_test_la_LDFLAGS = -no-undefined -rpath /nowhere
+                        libstaticroots_lib_test.la libstaticroots_lib2_test.la
+check_LTLIBRARIES += libstaticroots_lib_test.la libstaticroots_lib2_test.la
+libstaticroots_lib_test_la_SOURCES = tests/staticroots_lib.c
+libstaticroots_lib_test_la_LIBADD = $(test_ldadd)
+libstaticroots_lib_test_la_LDFLAGS = -no-undefined -rpath /nowhere
+libstaticroots_lib_test_la_DEPENDENCIES = $(top_builddir)/libgc.la
+libstaticroots_lib2_test_la_SOURCES = tests/staticroots_lib.c
+libstaticroots_lib2_test_la_LIBADD = $(test_ldadd)
+libstaticroots_lib2_test_la_CFLAGS = -DSTATICROOTSLIB2
+libstaticroots_lib2_test_la_LDFLAGS = -no-undefined -rpath /nowhere
 if ENABLE_SHARED
 staticrootstest_LDADD += $(top_builddir)/libgc.la
 endif
@@ -82,69 +82,69 @@ endif
 if KEEP_BACK_PTRS
 TESTS += tracetest$(EXEEXT)
 check_PROGRAMS += tracetest
-tracetest_SOURCES = tests/trace_test.c
+tracetest_SOURCES = tests/trace.c
 tracetest_LDADD = $(test_ldadd)
 endif
 
 if THREADS
 
-TESTS += test_atomic_ops$(EXEEXT)
-check_PROGRAMS += test_atomic_ops
-test_atomic_ops_SOURCES = tests/test_atomic_ops.c
-test_atomic_ops_LDADD = $(nodist_libgc_la_OBJECTS) $(EXTRA_TEST_LIBS) \
+TESTS += atomicopstest$(EXEEXT)
+check_PROGRAMS += atomicopstest
+atomicopstest_SOURCES = tests/atomicops.c
+atomicopstest_LDADD = $(nodist_libgc_la_OBJECTS) $(EXTRA_TEST_LIBS) \
                 $(ATOMIC_OPS_LIBS) $(THREADDLLIBS)
 
-TESTS += threadleaktest$(EXEEXT)
-check_PROGRAMS += threadleaktest
-threadleaktest_SOURCES = tests/thread_leak_test.c
-threadleaktest_LDADD = $(test_ldadd) $(THREADDLLIBS)
-
-TESTS += threadkey_test$(EXEEXT)
-check_PROGRAMS += threadkey_test
-threadkey_test_SOURCES = tests/threadkey_test.c
-threadkey_test_LDADD = $(test_ldadd) $(THREADDLLIBS)
+TESTS += initfromthreadtest$(EXEEXT)
+check_PROGRAMS += initfromthreadtest
+initfromthreadtest_SOURCES = tests/initfromthread.c
+initfromthreadtest_LDADD = $(test_ldadd) $(THREADDLLIBS)
 
-TESTS += subthreadcreate_test$(EXEEXT)
-check_PROGRAMS += subthreadcreate_test
-subthreadcreate_test_SOURCES = tests/subthread_create.c
-subthreadcreate_test_LDADD = $(test_ldadd)
+TESTS += subthreadcreatetest$(EXEEXT)
+check_PROGRAMS += subthreadcreatetest
+subthreadcreatetest_SOURCES = tests/subthreadcreate.c
+subthreadcreatetest_LDADD = $(test_ldadd)
 if ENABLE_SHARED
-subthreadcreate_test_LDADD += $(ATOMIC_OPS_LIBS)
+subthreadcreatetest_LDADD += $(ATOMIC_OPS_LIBS)
 endif
-subthreadcreate_test_LDADD += $(THREADDLLIBS)
+subthreadcreatetest_LDADD += $(THREADDLLIBS)
 
-TESTS += initsecondarythread_test$(EXEEXT)
-check_PROGRAMS += initsecondarythread_test
-initsecondarythread_test_SOURCES = tests/initsecondarythread.c
-initsecondarythread_test_LDADD = $(test_ldadd) $(THREADDLLIBS)
+TESTS += threadkeytest$(EXEEXT)
+check_PROGRAMS += threadkeytest
+threadkeytest_SOURCES = tests/threadkey.c
+threadkeytest_LDADD = $(test_ldadd) $(THREADDLLIBS)
+
+TESTS += threadleaktest$(EXEEXT)
+check_PROGRAMS += threadleaktest
+threadleaktest_SOURCES = tests/threadleak.c
+threadleaktest_LDADD = $(test_ldadd) $(THREADDLLIBS)
 
 endif
 
 if CPLUSPLUS
-TESTS += test_cpp$(EXEEXT)
-check_PROGRAMS += test_cpp
-test_cpp_SOURCES = tests/test_cpp.cc
+TESTS += cpptest$(EXEEXT)
+check_PROGRAMS += cpptest
+cpptest_SOURCES = tests/cpp.cc
 if AVOID_CPP_LIB
-test_cpp_LDADD = gc_badalc.o gc_cpp.o $(test_ldadd) $(CXXLIBS)
+cpptest_LDADD = gc_badalc.o gc_cpp.o $(test_ldadd) $(CXXLIBS)
 else
-test_cpp_LDADD = libgccpp.la $(nodist_libgc_la_OBJECTS) \
+cpptest_LDADD = libgccpp.la $(nodist_libgc_la_OBJECTS) \
                 $(EXTRA_TEST_LIBS) $(CXXLIBS)
 ## In case of static libraries build, libgc.a is already referenced in
 ## dependency_libs attribute of libgccpp.la file.
 if ENABLE_SHARED
-test_cpp_LDADD += $(top_builddir)/libgc.la
+cpptest_LDADD += $(top_builddir)/libgc.la
 endif
 endif
 endif
 
 if ENABLE_DISCLAIM
 
-TESTS += disclaim_test$(EXEEXT)
-check_PROGRAMS += disclaim_test
-disclaim_test_SOURCES = tests/disclaim_test.c
-disclaim_test_LDADD = $(test_ldadd)
+TESTS += disclaimtest$(EXEEXT)
+check_PROGRAMS += disclaimtest
+disclaimtest_SOURCES = tests/disclaim.c
+disclaimtest_LDADD = $(test_ldadd)
 if THREADS
-disclaim_test_LDADD += $(THREADDLLIBS)
+disclaimtest_LDADD += $(THREADDLLIBS)
 endif
 
 TESTS += disclaim_bench$(EXEEXT)
@@ -152,15 +152,15 @@ check_PROGRAMS += disclaim_bench
 disclaim_bench_SOURCES = tests/disclaim_bench.c
 disclaim_bench_LDADD = $(test_ldadd)
 
-TESTS += disclaim_weakmap_test$(EXEEXT)
-check_PROGRAMS += disclaim_weakmap_test
-disclaim_weakmap_test_SOURCES = tests/disclaim_weakmap_test.c
-disclaim_weakmap_test_LDADD = $(test_ldadd)
+TESTS += weakmaptest$(EXEEXT)
+check_PROGRAMS += weakmaptest
+weakmaptest_SOURCES = tests/weakmap.c
+weakmaptest_LDADD = $(test_ldadd)
 if THREADS
 if ENABLE_SHARED
-disclaim_weakmap_test_LDADD += $(ATOMIC_OPS_LIBS)
+weakmaptest_LDADD += $(ATOMIC_OPS_LIBS)
 endif
-disclaim_weakmap_test_LDADD += $(THREADDLLIBS)
+weakmaptest_LDADD += $(THREADDLLIBS)
 endif
 
 endif
@@ -172,18 +172,17 @@ check-without-test-driver: $(TESTS)
 	./hugetest$(EXEEXT)
 	./leaktest$(EXEEXT)
 	./middletest$(EXEEXT)
-	./realloc_test$(EXEEXT)
+	./realloctest$(EXEEXT)
 	./smashtest$(EXEEXT)
 	./staticrootstest$(EXEEXT)
+	test ! -f atomicopstest$(EXEEXT) || ./atomicopstest$(EXEEXT)
+	test ! -f cpptest$(EXEEXT) || ./cpptest$(EXEEXT)
 	test ! -f disclaim_bench$(EXEEXT) || ./disclaim_bench$(EXEEXT)
-	test ! -f disclaim_test$(EXEEXT) || ./disclaim_test$(EXEEXT)
-	test ! -f disclaim_weakmap_test$(EXEEXT) || ./disclaim_weakmap_test$(EXEEXT)
-	test ! -f initsecondarythread_test$(EXEEXT) \
-	  || ./initsecondarythread_test$(EXEEXT)
-	test ! -f test_atomic_ops$(EXEEXT) || ./test_atomic_ops$(EXEEXT)
-	test ! -f threadkey_test$(EXEEXT) || ./threadkey_test$(EXEEXT)
+	test ! -f disclaimtest$(EXEEXT) || ./disclaimtest$(EXEEXT)
+	test ! -f initfromthreadtest$(EXEEXT) || ./initfromthreadtest$(EXEEXT)
+	test ! -f subthreadcreatetest$(EXEEXT) || ./subthreadcreatetest$(EXEEXT)
+	test ! -f threadkeytest$(EXEEXT) || ./threadkeytest$(EXEEXT)
 	test ! -f threadleaktest$(EXEEXT) || ./threadleaktest$(EXEEXT)
-	test ! -f subthreadcreate_test$(EXEEXT) || ./subthreadcreate_test$(EXEEXT)
-	test ! -f test_cpp$(EXEEXT) || ./test_cpp$(EXEEXT)
 	test ! -f tracetest$(EXEEXT) || ./tracetest$(EXEEXT)
+	test ! -f weakmaptest$(EXEEXT) || ./weakmaptest$(EXEEXT)
 	./cordtest$(EXEEXT)
diff --git a/tests/threadkey_test.c b/tests/threadkey.c
index a678bd1e..3a318d87 100644
--- a/tests/threadkey_test.c
+++ b/tests/threadkey.c
@@ -26,7 +26,7 @@
 
 int main(void)
 {
-  printf("threadkey_test skipped\n");
+  printf("test skipped\n");
   return 0;
 }
 
diff --git a/tests/thread_leak_test.c b/tests/threadleak.c
index 33801c99..33801c99 100644
--- a/tests/thread_leak_test.c
+++ b/tests/threadleak.c
diff --git a/tests/trace_test.c b/tests/trace.c
index 92249ec9..92249ec9 100644
--- a/tests/trace_test.c
+++ b/tests/trace.c
diff --git a/tests/disclaim_weakmap_test.c b/tests/weakmap.c
index de4cf6e5..b8e4edff 100644
--- a/tests/disclaim_weakmap_test.c
+++ b/tests/weakmap.c
@@ -31,7 +31,7 @@
 # include "private/gc_priv.h"
 
   GC_ATTR_NO_SANITIZE_THREAD
-  static int GC_rand(void) /* same as in disclaim_test.c */
+  static int GC_rand(void) /* same as in disclaim.c */
   {
     static GC_RAND_STATE_T seed; /* concurrent update does not hurt the test */
     return GC_RAND_NEXT(&seed);