Skip to content

Commit 779534d

Browse files
committed
Merge branch 'sk/clar-trailer-urlmatch-norm-test'
A few traditional unit tests have been rewritten to use the clar framework. * sk/clar-trailer-urlmatch-norm-test: t/unit-tests: convert urlmatch-normalization test to clar t/unit-tests: convert trailer test to use clar
2 parents 743d3a5 + 7d4212b commit 779534d

File tree

5 files changed

+342
-363
lines changed

5 files changed

+342
-363
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,6 +1367,8 @@ CLAR_TEST_SUITES += u-reftable-tree
13671367
CLAR_TEST_SUITES += u-strbuf
13681368
CLAR_TEST_SUITES += u-strcmp-offset
13691369
CLAR_TEST_SUITES += u-strvec
1370+
CLAR_TEST_SUITES += u-trailer
1371+
CLAR_TEST_SUITES += u-urlmatch-normalization
13701372
CLAR_TEST_PROG = $(UNIT_TEST_BIN)/unit-tests$(X)
13711373
CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES))
13721374
CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o
@@ -1381,8 +1383,6 @@ UNIT_TEST_PROGRAMS += t-reftable-reader
13811383
UNIT_TEST_PROGRAMS += t-reftable-readwrite
13821384
UNIT_TEST_PROGRAMS += t-reftable-record
13831385
UNIT_TEST_PROGRAMS += t-reftable-stack
1384-
UNIT_TEST_PROGRAMS += t-trailer
1385-
UNIT_TEST_PROGRAMS += t-urlmatch-normalization
13861386
UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
13871387
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
13881388
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o

t/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ clar_test_suites = [
1212
'unit-tests/u-strbuf.c',
1313
'unit-tests/u-strcmp-offset.c',
1414
'unit-tests/u-strvec.c',
15+
'unit-tests/u-trailer.c',
16+
'unit-tests/u-urlmatch-normalization.c',
1517
]
1618

1719
clar_sources = [
@@ -60,8 +62,6 @@ unit_test_programs = [
6062
'unit-tests/t-reftable-readwrite.c',
6163
'unit-tests/t-reftable-record.c',
6264
'unit-tests/t-reftable-stack.c',
63-
'unit-tests/t-trailer.c',
64-
'unit-tests/t-urlmatch-normalization.c',
6565
]
6666

6767
foreach unit_test_program : unit_test_programs

t/unit-tests/t-trailer.c

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

0 commit comments

Comments
 (0)