From: Jason Ish Date: Wed, 26 Mar 2025 21:27:17 +0000 (-0600) Subject: tests: put dnp3 tests into a dnp3 sub-directory X-Git-Tag: suricata-7.0.11~141 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012594e0bb3408feafff205dfc7c44ab1aeb46fb;p=thirdparty%2Fsuricata-verify.git tests: put dnp3 tests into a dnp3 sub-directory --- diff --git a/tests/dnp3-del-measure/README.md b/tests/dnp3/dnp3-del-measure/README.md similarity index 100% rename from tests/dnp3-del-measure/README.md rename to tests/dnp3/dnp3-del-measure/README.md diff --git a/tests/dnp3-del-measure/input.pcap b/tests/dnp3/dnp3-del-measure/input.pcap similarity index 100% rename from tests/dnp3-del-measure/input.pcap rename to tests/dnp3/dnp3-del-measure/input.pcap diff --git a/tests/dnp3-del-measure/suricata.yaml b/tests/dnp3/dnp3-del-measure/suricata.yaml similarity index 100% rename from tests/dnp3-del-measure/suricata.yaml rename to tests/dnp3/dnp3-del-measure/suricata.yaml diff --git a/tests/dnp3-del-measure/test.yaml b/tests/dnp3/dnp3-del-measure/test.yaml similarity index 100% rename from tests/dnp3-del-measure/test.yaml rename to tests/dnp3/dnp3-del-measure/test.yaml diff --git a/tests/dnp3-dnp3_data-alert/README.md b/tests/dnp3/dnp3-dnp3_data-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_data-alert/README.md rename to tests/dnp3/dnp3-dnp3_data-alert/README.md diff --git a/tests/dnp3-dnp3_data-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml similarity index 87% rename from tests/dnp3-dnp3_data-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml index d416631d6..9ef953ccb 100644 --- a/tests/dnp3-dnp3_data-alert/suricata.yaml +++ b/tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- -include: ../../etc/suricata-3.1.2.yaml +include: ../../../etc/suricata-3.1.2.yaml outputs: - eve-log: diff --git a/tests/dnp3-dnp3_data-alert/test.rules b/tests/dnp3/dnp3-dnp3_data-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_data-alert/test.rules rename to tests/dnp3/dnp3-dnp3_data-alert/test.rules diff --git a/tests/dnp3-dnp3_data-alert/test.yaml b/tests/dnp3/dnp3-dnp3_data-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_data-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_data-alert/test.yaml diff --git a/tests/dnp3-dnp3_func-alert/README.md b/tests/dnp3/dnp3-dnp3_func-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_func-alert/README.md rename to tests/dnp3/dnp3-dnp3_func-alert/README.md diff --git a/tests/dnp3-dnp3_func-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml similarity index 87% rename from tests/dnp3-dnp3_func-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml index d416631d6..9ef953ccb 100644 --- a/tests/dnp3-dnp3_func-alert/suricata.yaml +++ b/tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- -include: ../../etc/suricata-3.1.2.yaml +include: ../../../etc/suricata-3.1.2.yaml outputs: - eve-log: diff --git a/tests/dnp3-dnp3_func-alert/test.rules b/tests/dnp3/dnp3-dnp3_func-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_func-alert/test.rules rename to tests/dnp3/dnp3-dnp3_func-alert/test.rules diff --git a/tests/dnp3-dnp3_func-alert/test.yaml b/tests/dnp3/dnp3-dnp3_func-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_func-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_func-alert/test.yaml diff --git a/tests/dnp3-dnp3_obj-alert/README.md b/tests/dnp3/dnp3-dnp3_obj-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_obj-alert/README.md rename to tests/dnp3/dnp3-dnp3_obj-alert/README.md diff --git a/tests/dnp3-dnp3_obj-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_obj-alert/suricata.yaml similarity index 100% rename from tests/dnp3-dnp3_obj-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_obj-alert/suricata.yaml diff --git a/tests/dnp3-dnp3_obj-alert/test.rules b/tests/dnp3/dnp3-dnp3_obj-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_obj-alert/test.rules rename to tests/dnp3/dnp3-dnp3_obj-alert/test.rules diff --git a/tests/dnp3-dnp3_obj-alert/test.yaml b/tests/dnp3/dnp3-dnp3_obj-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_obj-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_obj-alert/test.yaml diff --git a/tests/dnp3-en-spon/README.md b/tests/dnp3/dnp3-en-spon/README.md similarity index 100% rename from tests/dnp3-en-spon/README.md rename to tests/dnp3/dnp3-en-spon/README.md diff --git a/tests/dnp3-en-spon/input.pcap b/tests/dnp3/dnp3-en-spon/input.pcap similarity index 100% rename from tests/dnp3-en-spon/input.pcap rename to tests/dnp3/dnp3-en-spon/input.pcap diff --git a/tests/dnp3-en-spon/suricata.yaml b/tests/dnp3/dnp3-en-spon/suricata.yaml similarity index 100% rename from tests/dnp3-en-spon/suricata.yaml rename to tests/dnp3/dnp3-en-spon/suricata.yaml diff --git a/tests/dnp3-en-spon/test.yaml b/tests/dnp3/dnp3-en-spon/test.yaml similarity index 100% rename from tests/dnp3-en-spon/test.yaml rename to tests/dnp3/dnp3-en-spon/test.yaml diff --git a/tests/dnp3-eve/input.pcap b/tests/dnp3/dnp3-eve/input.pcap similarity index 100% rename from tests/dnp3-eve/input.pcap rename to tests/dnp3/dnp3-eve/input.pcap diff --git a/tests/dnp3-eve/suricata.yaml b/tests/dnp3/dnp3-eve/suricata.yaml similarity index 100% rename from tests/dnp3-eve/suricata.yaml rename to tests/dnp3/dnp3-eve/suricata.yaml diff --git a/tests/dnp3-eve/test.yaml b/tests/dnp3/dnp3-eve/test.yaml similarity index 100% rename from tests/dnp3-eve/test.yaml rename to tests/dnp3/dnp3-eve/test.yaml diff --git a/tests/dnp3-file-del/README.md b/tests/dnp3/dnp3-file-del/README.md similarity index 100% rename from tests/dnp3-file-del/README.md rename to tests/dnp3/dnp3-file-del/README.md diff --git a/tests/dnp3-file-del/input.pcap b/tests/dnp3/dnp3-file-del/input.pcap similarity index 100% rename from tests/dnp3-file-del/input.pcap rename to tests/dnp3/dnp3-file-del/input.pcap diff --git a/tests/dnp3-file-del/suricata.yaml b/tests/dnp3/dnp3-file-del/suricata.yaml similarity index 100% rename from tests/dnp3-file-del/suricata.yaml rename to tests/dnp3/dnp3-file-del/suricata.yaml diff --git a/tests/dnp3-file-del/test.yaml b/tests/dnp3/dnp3-file-del/test.yaml similarity index 100% rename from tests/dnp3-file-del/test.yaml rename to tests/dnp3/dnp3-file-del/test.yaml diff --git a/tests/dnp3-file-read/README.md b/tests/dnp3/dnp3-file-read/README.md similarity index 100% rename from tests/dnp3-file-read/README.md rename to tests/dnp3/dnp3-file-read/README.md diff --git a/tests/dnp3-file-read/input.pcap b/tests/dnp3/dnp3-file-read/input.pcap similarity index 100% rename from tests/dnp3-file-read/input.pcap rename to tests/dnp3/dnp3-file-read/input.pcap diff --git a/tests/dnp3-file-read/suricata.yaml b/tests/dnp3/dnp3-file-read/suricata.yaml similarity index 100% rename from tests/dnp3-file-read/suricata.yaml rename to tests/dnp3/dnp3-file-read/suricata.yaml diff --git a/tests/dnp3-file-read/test.yaml b/tests/dnp3/dnp3-file-read/test.yaml similarity index 100% rename from tests/dnp3-file-read/test.yaml rename to tests/dnp3/dnp3-file-read/test.yaml diff --git a/tests/dnp3-file-write/README.md b/tests/dnp3/dnp3-file-write/README.md similarity index 100% rename from tests/dnp3-file-write/README.md rename to tests/dnp3/dnp3-file-write/README.md diff --git a/tests/dnp3-file-write/input.pcap b/tests/dnp3/dnp3-file-write/input.pcap similarity index 100% rename from tests/dnp3-file-write/input.pcap rename to tests/dnp3/dnp3-file-write/input.pcap diff --git a/tests/dnp3-file-write/suricata.yaml b/tests/dnp3/dnp3-file-write/suricata.yaml similarity index 100% rename from tests/dnp3-file-write/suricata.yaml rename to tests/dnp3/dnp3-file-write/suricata.yaml diff --git a/tests/dnp3-file-write/test.yaml b/tests/dnp3/dnp3-file-write/test.yaml similarity index 100% rename from tests/dnp3-file-write/test.yaml rename to tests/dnp3/dnp3-file-write/test.yaml diff --git a/tests/dnp3-select-operate/README.md b/tests/dnp3/dnp3-select-operate/README.md similarity index 100% rename from tests/dnp3-select-operate/README.md rename to tests/dnp3/dnp3-select-operate/README.md diff --git a/tests/dnp3-select-operate/input.pcap b/tests/dnp3/dnp3-select-operate/input.pcap similarity index 100% rename from tests/dnp3-select-operate/input.pcap rename to tests/dnp3/dnp3-select-operate/input.pcap diff --git a/tests/dnp3-select-operate/suricata.yaml b/tests/dnp3/dnp3-select-operate/suricata.yaml similarity index 100% rename from tests/dnp3-select-operate/suricata.yaml rename to tests/dnp3/dnp3-select-operate/suricata.yaml diff --git a/tests/dnp3-select-operate/test.yaml b/tests/dnp3/dnp3-select-operate/test.yaml similarity index 100% rename from tests/dnp3-select-operate/test.yaml rename to tests/dnp3/dnp3-select-operate/test.yaml diff --git a/tests/dnp3-toclient-start/README.md b/tests/dnp3/dnp3-toclient-start/README.md similarity index 100% rename from tests/dnp3-toclient-start/README.md rename to tests/dnp3/dnp3-toclient-start/README.md diff --git a/tests/dnp3-toclient-start/dnp3_toclient_start.pcap b/tests/dnp3/dnp3-toclient-start/dnp3_toclient_start.pcap similarity index 100% rename from tests/dnp3-toclient-start/dnp3_toclient_start.pcap rename to tests/dnp3/dnp3-toclient-start/dnp3_toclient_start.pcap diff --git a/tests/dnp3-toclient-start/test.yaml b/tests/dnp3/dnp3-toclient-start/test.yaml similarity index 100% rename from tests/dnp3-toclient-start/test.yaml rename to tests/dnp3/dnp3-toclient-start/test.yaml diff --git a/tests/dnp3-write/README.md b/tests/dnp3/dnp3-write/README.md similarity index 100% rename from tests/dnp3-write/README.md rename to tests/dnp3/dnp3-write/README.md diff --git a/tests/dnp3-write/input.pcap b/tests/dnp3/dnp3-write/input.pcap similarity index 100% rename from tests/dnp3-write/input.pcap rename to tests/dnp3/dnp3-write/input.pcap diff --git a/tests/dnp3-write/suricata.yaml b/tests/dnp3/dnp3-write/suricata.yaml similarity index 100% rename from tests/dnp3-write/suricata.yaml rename to tests/dnp3/dnp3-write/suricata.yaml diff --git a/tests/dnp3-write/test.yaml b/tests/dnp3/dnp3-write/test.yaml similarity index 100% rename from tests/dnp3-write/test.yaml rename to tests/dnp3/dnp3-write/test.yaml