Do not build tests by default (Makefile.direct and other Makefiles)

This is to match the behavior of configure-based Makefile and the
CMake script. Tests are built and executed now by `make check`.

* BCC_MAKEFILE (all): Depend on gc.lib only (instead of gctest, de
and test_cpp).
* OS2_MAKEFILE (all): Likewise.
* BCC_MAKEFILE (check): New target to build and run the tests (de is
not executed).
* NT_MAKEFILE (check): Likewise.
* Makefile.direct (all): Remove dependency on gctest.
* NT_MAKEFILE (all): Remove dependency on gctest, de and test_cpp; add
dependency on gc.lib.
* OS2_MAKEFILE (check): New target to build and run gctest and
cordtest.
* README.QUICK (INSTALLATION): Change "make test" to "make check".
* README.md (Installation and Portability): Likewise.
* doc/README.arm.cross: Likewise.
* SMakefile.amiga (all): Depend on gc.lib and cord.lib only (instead
of gctest, setjmp_t, cordtest).
* SMakefile.amiga (test): Rename to "check".
* WCC_MAKEFILE (all): Remove dependency on gctest and test_cpp.
* digimars.mak (targets): Likewise.
* WCC_MAKEFILE (check): New symbolic target to build and run gctest
and test_cpp.
* digimars.mak (check): Likewise.
* digimars.mak (gc.lib): New target (depend on gc.dll target).
* doc/README.win32 (Watcom compiler): Remove information that wmake
compiles the tests by default.
* doc/README.win64: Update information about tests building.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 69436733992f39b006e4e13ffe50e841c899f2ff..9ad4e29c7c3f2b103f4a85f26f291cf1de71cba8 100644 (file)
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -39,7 +39,11 @@ XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
 \r
 OBJS= $(XXXOBJS:XXX=)\r
 \r
-all: gctest.exe de.exe test_cpp.exe\r
+all: gc.lib\r
+\r
+check: gctest.exe test_cpp.exe de.exe\r
+       gctest.exe\r
+       test_cpp.exe\r
 \r
 $(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE\r
 \r

diff --git a/Makefile.direct b/Makefile.direct
index 1b472c56b56af77cedf421a985eeaaae8d016380..7f0f07f39617d760b59e3285da53dcd33995a915 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -143,7 +143,7 @@ SPECIALCFLAGS= -I$(srcdir)/include -I$(AO_SRC_DIR)/src $(CFLAGS_FOR_PIC)
 # not time-critical anyway.
 # Set SPECIALCFLAGS to -q nodirect_code on Encore.
 
-all: base_lib gctest$(EXEEXT)
+all: base_lib
 
 atomic_ops.o: $(AO_SRC_DIR)/src/atomic_ops.c
        $(CC) $(CFLAGS) -c -o $@ $(AO_SRC_DIR)/src/atomic_ops.c

diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index dc0b4ef1e64294afffbb7dd9d3c57e2d96e5cb06..2dcc89f5ec07153d27bbcb0ed59d0f0ab5eeb233 100644 (file)
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -83,7 +83,11 @@ AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
 OBJS= misc.obj win32_threads.obj alloc.obj reclaim.obj allchblk.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj gcj_mlc.obj mallocx.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
-all: gctest.exe de.exe test_cpp.exe
+all: gc.lib
+
+check: gctest.exe test_cpp.exe de.exe
+       gctest.exe
+       test_cpp.exe
 
 .c.obj:
        $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) $(CFLAGS_DEFAULT) -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701

diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index c0fa88984cbbdccaf5bddff85f5ecb68aca7fa0c..522a4d0957147430d93c49d485dc1e9c55df6f11 100644 (file)
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -15,7 +15,11 @@ CFLAGS= /O /Q /DALL_INTERIOR_POINTERS /DENABLE_DISCLAIM /DGC_ATOMIC_UNCOLLECTABL
 # Setjmp_test may yield overly optimistic results when compiled
 # without optimization.
 
-all: $(OBJS) gctest.exe cordtest.exe
+all: gc.lib
+
+check: gctest.exe cordtest.exe
+        gctest.exe
+        cordtest.exe
 
 $(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h
 

diff --git a/README.QUICK b/README.QUICK
index 0648ab727f7662fc7a8845f264e5e354d8aeabac..1a742b9077a9196385133514621ab32180f3d70c 100644 (file)
--- a/README.QUICK
+++ b/README.QUICK
@@ -36,7 +36,7 @@ Alternative 2 (the new way): type
         See doc/README.autoconf for details
 
 Under Windows 95, 98, Me, NT, or 2000:
-copy the appropriate makefile to MAKEFILE, read it, and type "nmake test".
+copy the appropriate makefile to MAKEFILE, read it, and type "nmake check".
 (Under Windows, this assumes you have Microsoft command-line tools
 installed, and suitably configured.)
 Read the machine specific README.XXX in the doc directory if one exists.

diff --git a/README.md b/README.md
index 5f5c689b86f0f9d5107f7ec8a8cbc6ffda4a96ff..b7725b24053a6faeb126e003508c1cfa579a36a4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -204,8 +204,8 @@ a somewhat superficial test of collector functionality.  Failure is indicated
 by a core dump or a message to the effect that the collector is broken.  Gctest
 takes about a second to two to run on reasonable 2007 vintage desktops.  It may
 use up to about 30 MB of memory.  (The multi-threaded version will use more.
-64-bit versions may use more.) `make test` will also, as its last step, attempt
-to build and test the "cord" string library.)
+64-bit versions may use more.) `make check` will also, as its last step,
+attempt to build and test the "cord" string library.)
 
 Makefile.direct will generate a library gc.a which you should link against.
 Typing "make cords" will add the cord library to gc.a.

diff --git a/SMakefile.amiga b/SMakefile.amiga
index eb8f00479ca6243ecda5074d3c86a0ffe3e5ae83..d481f9863fb021c4615a2b73fd5696168f3b5dc5 100644 (file)
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -49,13 +49,13 @@ CSCOPT= $(OPT) DEFINE AMIGA IGNORE=100 IGNORE=161
 #------------------LINKING----------------------------
 
 
-all: gctest setjmp_t cordtest
+all: gc.lib cord.lib
 
 clean:
        delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/tests/*.o cordtest
        smake
 
-test: setjmp_t gctest cordtest
+check: setjmp_t gctest cordtest
        setjmp_t
        gctest
        cordtest

diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index 61a1db5308b1af2571b6f17cfeb4076458de9527..0eadd76ac90aa4e1149c1daaf833af8371b5a02e 100644 (file)
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -78,7 +78,11 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj &
       dbg_mlc.obj malloc.obj dyn_load.obj &
       typd_mlc.obj ptr_chck.obj mallocx.obj fnlz_mlc.obj gcj_mlc.obj
 
-all: gc.lib gctest.exe test_cpp.exe
+all: gc.lib
+
+check: gctest.exe test_cpp.exe .SYMBOLIC
+        *gctest.exe
+        *test_cpp.exe
 
 !ifdef MAKE_AS_DLL
 

diff --git a/digimars.mak b/digimars.mak
index 1388d3539995065697d98b9d2bd259bef5bed2ff..bf1b8b763e87164dd44689afd0dfc392f08ee921 100644 (file)
--- a/digimars.mak
+++ b/digimars.mak
@@ -39,7 +39,13 @@ OBJS=        \
        typd_mlc.obj\\r
        win32_threads.obj\r
 \r
-targets: gc.dll gc.lib gctest.exe test_cpp.exe\r
+targets: gc.dll gc.lib\r
+\r
+check: gctest.exe test_cpp.exe\r
+       gctest.exe\r
+       test_cpp.exe\r
+\r
+gc.lib: gc.dll\r
 \r
 gc.dll: $(OBJS) gc.def digimars.mak\r
        $(CC) -ogc.dll $(OBJS) -L$(LFLAGS) gc.def kernel32.lib user32.lib\r

diff --git a/doc/README.arm.cross b/doc/README.arm.cross
index 0d208392e89a9e11fc0b523ee8d370d9173382dc..9e60dda77bc350e8a9484407cec68189948e2a10 100644 (file)
--- a/doc/README.arm.cross
+++ b/doc/README.arm.cross
@@ -30,7 +30,7 @@ Then do the following on the ARM machine
    cd .libs
    ./lt-gctest
 
-Do not try to do "make test" (the usual way of running the test
+Do not try to do "make check" (the usual way of running the test
 program).  This does not work and seems to erase some of the important
 files.
 

diff --git a/doc/README.win32 b/doc/README.win32
index 074b3a3eb520b4d38b673835628c2fc7e51d90d3..67b14763d5a7b25d4ccef9c974954d6736e08273 100644 (file)
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -124,7 +124,7 @@ Before compiling you may need to edit WCC_MAKEFILE to set target
 platform, library type (dynamic or static), calling conventions, and
 optimization options.
 
-To compile the collector and testing programs use the command:
+To compile the collector use the command:
     wmake -f WCC_MAKEFILE
 
 All programs using gc should be compiled with 4-byte alignment.

diff --git a/doc/README.win64 b/doc/README.win64
index 127db4a4d3d122402436e8be8878cb20680cfd21..b2d83044c8b5f0b48a64937a10755bf00acb1b7c 100644 (file)
--- a/doc/README.win64
+++ b/doc/README.win64
@@ -4,9 +4,10 @@ with Microsoft Visual C++ 2005 or with mingw-w64 gcc.
 NT_MAKEFILE has been used in this environment.  Type
 "nmake -f NT_MAKEFILE cpu=AMD64 nodebug=1" in a Visual C++ command line
 window to build the release variant of the dynamic library with threads
-support and the usual test programs.
-To verify that the collector is at least somewhat functional, run gctest.exe.
-This should create gctest.gc.log after a few seconds.
+support.
+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
 that we're getting wrong instances of operator new/delete in some cases.)