From 4fad4e58810c5f967642190142d828e632715b5d Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 14 Mar 2017 00:08:26 +0300 Subject: [PATCH] Rename 'test' to 'check' target in Makefile.direct This is to match the target name in Makefile generated by configure. * Makefile.direct: Update comment about testing (rename "test" target to "check"). * Makefile.direct (check): Renamed from "test". * Makefile.direct (test): Depend on check; add comment. * README.QUICK (INSTALLATION): Leave information only about the recent GC version. * README.QUICK (INSTALLATION): Replace "make test" with "make check". * README.md (Installation and Portability): Likewise. --- Makefile.direct | 11 +++++++---- README.QUICK | 6 ++---- README.md | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile.direct b/Makefile.direct index a222208..996786d 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -5,9 +5,9 @@ # gc.a - builds basic library # c++ - adds C++ interface to library # cords - adds cords (heavyweight strings) to library -# test - prints porting information, then builds basic version of gc.a, -# and runs some tests of collector and cords. Does not add cords or -# c++ interface to gc.a +# check - prints porting information, then builds basic version of gc.a, +# and runs some tests of collector and cords. Does not add cords or +# c++ interface to gc.a # cord/de - builds dumb editor based on cords. ABI_FLAG= @@ -408,11 +408,14 @@ gctest: tests/test.o gc.a $(UTILS) setjmp_test: $(srcdir)/tools/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/tools/setjmp_t.c -test: cord/cordtest gctest setjmp_test +check: cord/cordtest gctest setjmp_test ./setjmp_test ./gctest cord/cordtest +# A synonym to "check" (for compatibility with older GC versions). +test: check + add_gc_prefix: $(srcdir)/tools/add_gc_prefix.c $(srcdir)/include/gc_version.h $(CC) -o add_gc_prefix $(srcdir)/tools/add_gc_prefix.c diff --git a/README.QUICK b/README.QUICK index f30f116..7f4c9e2 100644 --- a/README.QUICK +++ b/README.QUICK @@ -26,10 +26,8 @@ For the version number, see README.md or include/gc_version.h files. INSTALLATION: Under UN*X, Linux: -Alternative 1 (the old way): type "make test" in this directory. - Link against gc.a. With the most recent GC distributions - you may have to type "make -f Makefile.direct test" or - copy Makefile.direct to Makefile first. +Alternative 1 (the old way): type "make -f Makefile.direct check". + Link against gc.a. Alternative 2 (the new way): type "./configure --prefix=; make; make check; make install". diff --git a/README.md b/README.md index 355b3d3..c2a8baa 100644 --- a/README.md +++ b/README.md @@ -193,7 +193,7 @@ configure execution, this means pkg.m4 cannot be found, most probably you should run `pkg-config` once before running `./autogen.sh` (autoreconf). Below we focus on the collector build using classic makefile. -For the Makefile.direct-based process, typing `make test` instead of `make` +For the Makefile.direct-based process, typing `make check` instead of `make` will automatically build the collector and then run `setjmp_test` and `gctest`. `Setjmp_test` will give you information about configuring the collector, which is useful primarily if you have a machine that's not already supported. Gctest is -- 2.7.4