summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBasha Mougamadou <b.mougamadou@criteo.com>2021-08-13 09:45:34 +0200
committerBasha Mougamadou <b.mougamadou@criteo.com>2021-08-13 11:38:38 +0200
commit34a2283431185338da543d7da50a43c6af49a6fd (patch)
tree54dfbdbea178efb4e9c3badb728633b3652a1509
parentMerge pull request #9374 from mjstapp/fix_nhg_add_leak (diff)
downloadfrr-34a2283431185338da543d7da50a43c6af49a6fd.tar.xz
frr-34a2283431185338da543d7da50a43c6af49a6fd.zip
tests: add feature to not run ospfd test when opted out
Signed-off-by: Basha Mougamadou <b.mougamadou@criteo.com>
-rw-r--r--tests/subdir.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/subdir.am b/tests/subdir.am
index 45236287c..b0be63c69 100644
--- a/tests/subdir.am
+++ b/tests/subdir.am
@@ -35,8 +35,10 @@ if OSPFD
TESTS_OSPFD = \
tests/ospfd/test_ospf_spf \
# end
+IGNORE_OSPFD =
else
TESTS_OSPFD =
+IGNORE_OSPFD = --ignore=ospfd/
endif
if OSPF6D
@@ -486,7 +488,7 @@ endif
.PHONY: tests/tests.xml
tests/tests.xml: $(check_PROGRAMS)
- ( cd tests; $(PYTHON) ../$(srcdir)/tests/runtests.py --junitxml=tests.xml -v ../$(srcdir)/tests $(IGNORE_BGPD) $(IGNORE_ISISD) $(IGNORE_OSPF6D); )
+ ( cd tests; $(PYTHON) ../$(srcdir)/tests/runtests.py --junitxml=tests.xml -v ../$(srcdir)/tests $(IGNORE_BGPD) $(IGNORE_ISISD) $(IGNORE_OSPFD) $(IGNORE_OSPF6D); )
check: tests/tests.xml
clean-local: clean-tests