From 5c5ff37eb16f346631ac461d4592f4541da45515 Mon Sep 17 00:00:00 2001 From: bluhm Date: Tue, 7 Sep 2021 11:10:28 +0000 Subject: [PATCH] Regress targets for PROGS are created by default now. Do not run the program rde_trie_test without a parameter. Create separate tests for each option. OK claudio@ --- regress/usr.sbin/bgpd/unittests/Makefile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/regress/usr.sbin/bgpd/unittests/Makefile b/regress/usr.sbin/bgpd/unittests/Makefile index b7e01f5f343..799bd4fcb54 100644 --- a/regress/usr.sbin/bgpd/unittests/Makefile +++ b/regress/usr.sbin/bgpd/unittests/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2021/01/19 16:04:46 claudio Exp $ +# $OpenBSD: Makefile,v 1.9 2021/09/07 11:10:28 bluhm Exp $ .PATH: ${.CURDIR}/../../../../usr.sbin/bgpd @@ -7,7 +7,7 @@ PROGS += rde_trie_test PROGS += rde_community_test PROGS += rde_decide_test -. for p in ${PROGS} +.for p in ${PROGS} REGRESS_TARGETS += run-regress-$p .endfor @@ -16,32 +16,26 @@ LDADD= -lutil DPADD+= ${LIBUTIL} SRCS_rde_sets_test= rde_sets_test.c rde_sets.c timer.c log.c -run-regress-rde_sets_test: rde_sets_test - ./rde_sets_test SRCS_rde_trie_test= rde_trie_test.c rde_trie.c util.c rde_sets.c timer.c log.c +run-regress-rde_trie_test: + # cannot run without parameter + TRIE_TESTS=1 2 3 4 5 6 TRIE4_FLAGS=-o TRIE5_FLAGS=-r TRIE6_FLAGS=-r .for n in ${TRIE_TESTS} -TRIE_TARGETS+=run-regress-rde_trie_test-${n} - +REGRESS_TARGETS+=run-regress-rde_trie_test-${n} run-regress-rde_trie_test-${n}: rde_trie_test ./rde_trie_test ${TRIE${n}_FLAGS} ${.CURDIR}/rde_trie_test.${n}.in \ ${.CURDIR}/rde_trie_test.${n}.check | \ diff -u ${.CURDIR}/rde_trie_test.${n}.out /dev/stdin .endfor -run-regress-rde_trie_test: ${TRIE_TARGETS} - SRCS_rde_community_test= rde_community_test.c rde_community.c -run-regress-rde_community_test: rde_community_test - ./rde_community_test SRCS_rde_decide_test= rde_decide_test.c rde_decide.c rde_attr.c util.c -run-regress-rde_decide_test: rde_decide_test - ./rde_decide_test .include -- 2.20.1