Skip to content

Commit a9bc27f

Browse files
committed
Merge branch 'gt/unit-test-urlmatch-normalization'
Another rewrite of test. * gt/unit-test-urlmatch-normalization: t: migrate t0110-urlmatch-normalization to the new framework
2 parents 029c870 + 0502663 commit a9bc27f

18 files changed

+272
-261
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ TEST_BUILTINS_OBJS += test-submodule.o
843843
TEST_BUILTINS_OBJS += test-subprocess.o
844844
TEST_BUILTINS_OBJS += test-trace2.o
845845
TEST_BUILTINS_OBJS += test-truncate.o
846-
TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
847846
TEST_BUILTINS_OBJS += test-userdiff.o
848847
TEST_BUILTINS_OBJS += test-wildmatch.o
849848
TEST_BUILTINS_OBJS += test-windows-named-pipe.o
@@ -1350,6 +1349,7 @@ UNIT_TEST_PROGRAMS += t-strbuf
13501349
UNIT_TEST_PROGRAMS += t-strcmp-offset
13511350
UNIT_TEST_PROGRAMS += t-strvec
13521351
UNIT_TEST_PROGRAMS += t-trailer
1352+
UNIT_TEST_PROGRAMS += t-urlmatch-normalization
13531353
UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
13541354
UNIT_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS))
13551355
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o

t/helper/test-tool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ static struct test_cmd cmds[] = {
8383
{ "trace2", cmd__trace2 },
8484
{ "truncate", cmd__truncate },
8585
{ "userdiff", cmd__userdiff },
86-
{ "urlmatch-normalization", cmd__urlmatch_normalization },
8786
{ "xml-encode", cmd__xml_encode },
8887
{ "wildmatch", cmd__wildmatch },
8988
#ifdef GIT_WINDOWS_NATIVE

t/helper/test-tool.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ int cmd__subprocess(int argc, const char **argv);
7676
int cmd__trace2(int argc, const char **argv);
7777
int cmd__truncate(int argc, const char **argv);
7878
int cmd__userdiff(int argc, const char **argv);
79-
int cmd__urlmatch_normalization(int argc, const char **argv);
8079
int cmd__xml_encode(int argc, const char **argv);
8180
int cmd__wildmatch(int argc, const char **argv);
8281
#ifdef GIT_WINDOWS_NATIVE

t/helper/test-urlmatch-normalization.c

Lines changed: 0 additions & 56 deletions
This file was deleted.

t/t0110-urlmatch-normalization.sh

Lines changed: 0 additions & 182 deletions
This file was deleted.

t/t0110/README

Lines changed: 0 additions & 9 deletions
This file was deleted.

t/t0110/url-1

Lines changed: 0 additions & 1 deletion
This file was deleted.

t/t0110/url-10

Lines changed: 0 additions & 1 deletion
This file was deleted.

t/t0110/url-11

Lines changed: 0 additions & 1 deletion
This file was deleted.

t/t0110/url-2

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)