Re: [GSoC][PATCH v2] t/: port helper/test-strcmp-offset.c to unit-tests/t-strcmp-offset.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Junio C Hamano <gitster@xxxxxxxxx> writes:

> Please do not base a new topic on 'next', as I will NOT be applying
> it on top of 'next'.
> ...
> Unless the conflicts are severe and is impractical, in which case
> see Documentation/SubmittingPatches and look for "Under truly
> exceptional circumstances".  But the conflict in Makefile about
> UNIT_TEST_PROGRAMS in this case hadly qualifies as one.
> Anyway, thanks for a patch.

I've backported the patch to apply to "master" and queued it on its
own topic, so that it no longer has to wait for all other topic in
'next'.  The Makefile looks like the attached, which is just with
trivial difference in the context.  We only need to remove
strcmp-offset from the TEST_BUILTIN_OBJS and instead add a
corresponding one to UNIT_TEST_PROGRAMS, and that does not change no
matter what other test-*.o are added to the former or t-* are added
to the latter.

We may want to sort the UNIT_TEST_PROGRAMS list alphabetically at
some point, by the way.


diff --git a/Makefile b/Makefile
index cf504963c2..1afa112706 100644
--- a/Makefile
+++ b/Makefile
@@ -839,7 +839,6 @@ TEST_BUILTINS_OBJS += test-sha1.o
 TEST_BUILTINS_OBJS += test-sha256.o
 TEST_BUILTINS_OBJS += test-sigchain.o
 TEST_BUILTINS_OBJS += test-simple-ipc.o
-TEST_BUILTINS_OBJS += test-strcmp-offset.o
 TEST_BUILTINS_OBJS += test-string-list.o
 TEST_BUILTINS_OBJS += test-submodule-config.o
 TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o
@@ -1338,6 +1337,7 @@ UNIT_TEST_PROGRAMS += t-mem-pool
 UNIT_TEST_PROGRAMS += t-prio-queue
+UNIT_TEST_PROGRAMS += t-strcmp-offset
 UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux