From dd7c25572e265671bac8510f0193d2db3485703e Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Wed, 21 Aug 2019 15:00:05 -0400 Subject: [PATCH 90/99] fix: tests/regression/gh509: skip if host doesn't support defaults Fixes: d669a213d298 ("test: missing firewalld.conf") (cherry picked from commit a8925505f5a5ae79abf34211517d5fb04404e7a7) (cherry picked from commit 0d24a659d9c72ef7e72f51b37bc2c53b24dee658) --- src/tests/regression/gh509.at | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tests/regression/gh509.at b/src/tests/regression/gh509.at index 332b2251263d..44074fda3550 100644 --- a/src/tests/regression/gh509.at +++ b/src/tests/regression/gh509.at @@ -1,6 +1,11 @@ FWD_START_TEST([missing firewalld.conf file]) AT_KEYWORDS(gh509) +dnl We're going to wipe the config below and therefore use the defaults. As +dnl such, if our test host doesn't support defaults then we must skip this test +dnl group. +m4_if(no, HOST_SUPPORTS_NFT_FIB, [AT_SKIP_IF([:])]) + AT_CHECK([if ! rm ./firewalld.conf; then exit 77; fi]) FWD_RESTART -- 2.20.1