From 6c95f06878e49de3e74b049378e88e76e9f342b2 Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Wed, 16 Oct 2019 12:34:06 -0400
Subject: [PATCH 113/122] fix: test: use debug output based on autotest
variable
Instead of the makefile/environment variables. This allows "./testsuite
-d" to function as expected.
(cherry picked from commit a464e068fb500e7cad59c368b4886b465c487768)
(cherry picked from commit 7515f5e8738a7d9ef51fe5848db9ea9105251bd9)
---
src/tests/functions.at | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/tests/functions.at b/src/tests/functions.at
index 02efe8ea431b..209f0f5d2ea9 100644
--- a/src/tests/functions.at
+++ b/src/tests/functions.at
@@ -11,10 +11,7 @@ m4_define([FWD_STOP_FIREWALLD], [
m4_define([FWD_START_FIREWALLD], [
FIREWALLD_ARGS="--nofork --nopid --log-file ./firewalld.log --system-config ./"
dnl if testsuite ran with debug flag, add debug output
- case "${TESTSUITEFLAGS}" in
- *-d*|*--debug*) FIREWALLD_ARGS="--debug=3 ${FIREWALLD_ARGS}";;
- *) :;;
- esac
+ ${at_debug_p} && FIREWALLD_ARGS="--debug=3 ${FIREWALLD_ARGS}"
if test "x${FIREWALLD_DEFAULT_CONFIG}" != x ; then
FIREWALLD_ARGS+=" --default-config ${FIREWALLD_DEFAULT_CONFIG}"
fi
--
2.23.0