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