|
 |
40251c |
From 529c233fca75fc302a86b01251b7c7bf31e188ad Mon Sep 17 00:00:00 2001
|
|
|
40251c |
From: Eric Garver <eric@garver.life>
|
|
|
40251c |
Date: Wed, 15 Jan 2020 13:46:42 -0500
|
|
|
40251c |
Subject: [PATCH 26/37] improvement: test: move firewall-cmd.at and
|
|
|
40251c |
firewall-offline-cmd.at inside directory
|
|
|
40251c |
|
|
|
40251c |
(cherry picked from commit 60197b143b1abf1cae618649fcb4ca595c6fb46d)
|
|
|
40251c |
(cherry picked from commit 8f6dd39747b00b6cf5b0dfb526b75b4dd7ef9077)
|
|
|
40251c |
---
|
|
|
40251c |
src/tests/{ => cli}/firewall-cmd.at | 0
|
|
|
40251c |
src/tests/{ => cli}/firewall-offline-cmd.at | 2 +-
|
|
|
40251c |
src/tests/testsuite.at | 4 ++--
|
|
|
40251c |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
40251c |
rename src/tests/{ => cli}/firewall-cmd.at (100%)
|
|
|
40251c |
rename src/tests/{ => cli}/firewall-offline-cmd.at (98%)
|
|
|
40251c |
|
|
|
40251c |
diff --git a/src/tests/firewall-cmd.at b/src/tests/cli/firewall-cmd.at
|
|
|
40251c |
similarity index 100%
|
|
|
40251c |
rename from src/tests/firewall-cmd.at
|
|
|
40251c |
rename to src/tests/cli/firewall-cmd.at
|
|
|
40251c |
diff --git a/src/tests/firewall-offline-cmd.at b/src/tests/cli/firewall-offline-cmd.at
|
|
|
40251c |
similarity index 98%
|
|
|
40251c |
rename from src/tests/firewall-offline-cmd.at
|
|
|
40251c |
rename to src/tests/cli/firewall-offline-cmd.at
|
|
|
40251c |
index 8cd6b6c5550f..e763eeb95839 100644
|
|
|
40251c |
--- a/src/tests/firewall-offline-cmd.at
|
|
|
40251c |
+++ b/src/tests/cli/firewall-offline-cmd.at
|
|
|
40251c |
@@ -8,7 +8,7 @@ dnl
|
|
|
40251c |
dnl !!! DO NOT ADD TESTS HERE !!!
|
|
|
40251c |
|
|
|
40251c |
m4_define([TESTING_FIREWALL_OFFLINE_CMD])
|
|
|
40251c |
-m4_include([firewall-cmd.at])
|
|
|
40251c |
+m4_include([cli/firewall-cmd.at])
|
|
|
40251c |
m4_include([features/features.at])
|
|
|
40251c |
|
|
|
40251c |
dnl Now begin the tests explicitly for firewall-offline-cmd
|
|
|
40251c |
diff --git a/src/tests/testsuite.at b/src/tests/testsuite.at
|
|
|
40251c |
index 546b301f1cb2..c48123cea910 100644
|
|
|
40251c |
--- a/src/tests/testsuite.at
|
|
|
40251c |
+++ b/src/tests/testsuite.at
|
|
|
40251c |
@@ -7,11 +7,11 @@ m4_define([m4_include], [m4_builtin([include], [$1])])
|
|
|
40251c |
|
|
|
40251c |
m4_include([functions.at])
|
|
|
40251c |
|
|
|
40251c |
-m4_include([firewall-offline-cmd.at])
|
|
|
40251c |
+m4_include([cli/firewall-offline-cmd.at])
|
|
|
40251c |
m4_include([dbus/dbus.at])
|
|
|
40251c |
|
|
|
40251c |
m4_foreach([FIREWALL_BACKEND], [[nftables], [iptables]], [
|
|
|
40251c |
- m4_include([firewall-cmd.at])
|
|
|
40251c |
+ m4_include([cli/firewall-cmd.at])
|
|
|
40251c |
m4_include([regression/regression.at])
|
|
|
40251c |
m4_include([python/python.at])
|
|
|
40251c |
m4_include([features/features.at])
|
|
|
40251c |
--
|
|
|
40251c |
2.23.0
|
|
|
40251c |
|