From c138ff821cbe26b6a329091239c29238c927cbe2 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 9 Sep 2024 00:32:40 -0500 Subject: [PATCH] rx: Remove $(TESTS) from src/rx/test/Makefile.in Commit 004c797daa (tests: Introduce 'make check TESTS=test/name') removed various $(TESTS) makefile variables from the tests/ directory, so we can run 'make check TESTS=test/name' and not interfere with the build. Later, commit 236cb51b83 (rx: Cleanup and build src/rx/test) changed src/rx/test to be built by default, but src/rx/test/Makefile.in uses a variable called $(TESTS). As a result, now building with 'make check TESTS=test/name' fails, for example: $ make check TESTS=rx/simple [...] cd src && cd rx/test && make all make[1]: Entering directory `.../src/rx/test' make[1]: *** No rule to make target `rx/simple', needed by `test'. Stop. make[1]: Leaving directory `.../src/rx/test' To avoid this, rename $(TESTS) to $(BINS), just like commit 004c797daa did. Also rename the related $(TH_TESTS) to $(TH_BINS) for consistency. Change-Id: I2cdd4545ee99eb4ed69e8f55341e0ba4dc34d5f3 Reviewed-on: https://gerrit.openafs.org/15847 Tested-by: BuildBot Reviewed-by: Cheyenne Wills Reviewed-by: Michael Meffie --- src/rx/test/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 84fdcc3137..f1dcfe279a 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -27,18 +27,18 @@ MT_LINK = $(CC) $(MT_CFLAGS) $(COMMON_CFLAGS) $(AFS_LDFLAGS) -o $@ \ $(LIB_hcrypto) $(LIB_roken) \ $(MT_LIBS) -TESTS = testclient testserver kstest kctest tableGen generator +BINS = testclient testserver kstest kctest tableGen generator -TH_TESTS = th_testserver th_testclient +TH_BINS = th_testserver th_testclient all: test th_test install dest: -test tests: ${TESTS} +test tests: ${BINS} -th_test th_tests: ${TH_TESTS} +th_test th_tests: ${TH_BINS} testclient: ../librx.a testclient.o ${LINK} @@ -76,4 +76,4 @@ th_testserver.o: testserver.c ${RXTESTOBJS}: ${BASICINCLS} ../rx.h clean: - $(RM) -f *.o *.a ${TESTS} ${TH_TESTS} core + $(RM) -f *.o *.a ${BINS} ${TH_BINS} core