Makefile: rename clar-related variables to avoid confusion
The Makefile variables related to the recently-introduced clar testing framework have a `UNIT_TESTS_` prefix. This prefix is extremely similar to the prefix used by our other unit tests that use our homegrown unit testing framework, which is `UNIT_TEST_`. The consequence is that it is easy to misread the names and confuse them with each other. Rename the clar-related variables to instead have a `CLAR_TEST_` prefix to address this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Sep 10, 2024 at 08:23 UTC
c3de556a841f132832f742d1c4d3a2618ee3b355
1 file changed
+17
-17
Makefile
+17
-17
@@ -1336,12 +1336,12 @@ THIRD_PARTY_SOURCES += sha1dc/%
1336
THIRD_PARTY_SOURCES += $(UNIT_TEST_DIR)/clar/%
1337
THIRD_PARTY_SOURCES += $(UNIT_TEST_DIR)/clar/clar/%
1338
1339
-UNIT_TESTS_SUITES += ctype
1340
-UNIT_TESTS_SUITES += strvec
1341
-UNIT_TESTS_PROG = $(UNIT_TEST_BIN)/unit-tests$(X)
1342
-UNIT_TESTS_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TESTS_SUITES))
1343
-UNIT_TESTS_OBJS += $(UNIT_TEST_DIR)/clar/clar.o
1344
-UNIT_TESTS_OBJS += $(UNIT_TEST_DIR)/unit-test.o
1339
+CLAR_TEST_SUITES += ctype
1340
+CLAR_TEST_SUITES += strvec
1341
+CLAR_TEST_PROG = $(UNIT_TEST_BIN)/unit-tests$(X)
1342
+CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES))
1343
+CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o
1344
+CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
1345
1346
UNIT_TEST_PROGRAMS += t-example-decorate
1347
UNIT_TEST_PROGRAMS += t-hash
@@ -2721,7 +2721,7 @@ OBJECTS += $(XDIFF_OBJS)
2721
OBJECTS += $(FUZZ_OBJS)
2722
OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
2723
OBJECTS += $(UNIT_TEST_OBJS)
2724
-OBJECTS += $(UNIT_TESTS_OBJS)
2724
+OBJECTS += $(CLAR_TEST_OBJS)
2725
2726
ifndef NO_CURL
2727
OBJECTS += http.o http-walker.o remote-curl.o
@@ -3224,7 +3224,7 @@ endif
3224
3225
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
3226
3227
-all:: $(TEST_PROGRAMS) $(test_bindir_programs) $(UNIT_TEST_PROGS) $(UNIT_TESTS_PROG)
3227
+all:: $(TEST_PROGRAMS) $(test_bindir_programs) $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG)
3228
3229
bin-wrappers/%: wrap-for-bin.sh
3230
$(call mkdir_p_parent_template)
@@ -3656,7 +3656,7 @@ endif
3656
3657
artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \
3658
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
3659
- $(UNIT_TEST_PROGS) $(UNIT_TESTS_PROG) $(MOFILES)
3659
+ $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG) $(MOFILES)
3660
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
3661
SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
3662
test -n "$(ARTIFACTS_DIRECTORY)"
@@ -3873,25 +3873,25 @@ $(UNIT_TEST_PROGS): $(UNIT_TEST_BIN)/%$X: $(UNIT_TEST_DIR)/%.o \
3873
$(filter %.o,$^) $(filter %.a,$^) $(LIBS)
3874
3875
GIT-TEST-SUITES: FORCE
3876
- @FLAGS='$(UNIT_TESTS_SUITES)'; \
3876
+ @FLAGS='$(CLAR_TEST_SUITES)'; \
3877
if test x"$$FLAGS" != x"`cat GIT-TEST-SUITES 2>/dev/null`" ; then \
3878
echo >&2 " * new test suites"; \
3879
echo "$$FLAGS" >GIT-TEST-SUITES; \
3880
fi
3881
3882
-$(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(UNIT_TESTS_SUITES)) GIT-TEST-SUITES
3883
- $(QUIET_GEN)for suite in $(UNIT_TESTS_SUITES); do \
3882
+$(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUITES)) GIT-TEST-SUITES
3883
+ $(QUIET_GEN)for suite in $(CLAR_TEST_SUITES); do \
3884
sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)$$\)/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \
3885
done >$@
3886
$(UNIT_TEST_DIR)/clar.suite: $(UNIT_TEST_DIR)/clar-decls.h
3887
$(QUIET_GEN)awk -f $(UNIT_TEST_DIR)/clar-generate.awk $< >$(UNIT_TEST_DIR)/clar.suite
3888
-$(UNIT_TESTS_OBJS): $(UNIT_TEST_DIR)/clar-decls.h
3889
-$(UNIT_TESTS_OBJS): EXTRA_CPPFLAGS = -I$(UNIT_TEST_DIR)
3890
-$(UNIT_TESTS_PROG): $(UNIT_TEST_DIR)/clar.suite $(UNIT_TESTS_OBJS) $(GITLIBS) GIT-LDFLAGS
3888
+$(CLAR_TEST_OBJS): $(UNIT_TEST_DIR)/clar-decls.h
3889
+$(CLAR_TEST_OBJS): EXTRA_CPPFLAGS = -I$(UNIT_TEST_DIR)
3890
+$(CLAR_TEST_PROG): $(UNIT_TEST_DIR)/clar.suite $(CLAR_TEST_OBJS) $(GITLIBS) GIT-LDFLAGS
3891
$(call mkdir_p_parent_template)
3892
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
3893
3894
.PHONY: build-unit-tests unit-tests
3895
-build-unit-tests: $(UNIT_TEST_PROGS) $(UNIT_TESTS_PROG)
3896
-unit-tests: $(UNIT_TEST_PROGS) $(UNIT_TESTS_PROG) t/helper/test-tool$X
3895
+build-unit-tests: $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG)
3896
+unit-tests: $(UNIT_TEST_PROGS) $(CLAR_TEST_PROG) t/helper/test-tool$X
3897
$(MAKE) -C t/ unit-tests