From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 10 Dec 2021 15:13:14 +0000 (-0600)
Subject: dataset tests: use args instead of full command
X-Git-Tag: suricata-6.0.5~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a538ed3b752e4c34830cdf973435ab3160cf8c;p=thirdparty%2Fsuricata-verify.git

dataset tests: use args instead of full command

All these tests were using a full command to set the --data-dir
argument. Instead just the default command be used but add an
addition --data-dir argument.
---

diff --git a/tests/datasets-01/test.yaml b/tests/datasets-01/test.yaml
index 2a82606d3..029c35a40 100644
--- a/tests/datasets-01/test.yaml
+++ b/tests/datasets-01/test.yaml
@@ -2,13 +2,10 @@ requires:
   files:
     - src/datasets.c
 
-command: |
-  ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/classification.config"    \
-      --set reference-config-file="${SRCDIR}/reference.config" -l ${OUTPUT_DIR}         \
-      -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules  \
-      --data-dir="${OUTPUT_DIR}"
+args:
+  - --data-dir=${OUTPUT_DIR}
 
 checks:
   - file-compare:
       filename: datasets.csv
-      expected: expected/datasets.csv
\ No newline at end of file
+      expected: expected/datasets.csv
diff --git a/tests/datasets-05-state/test.yaml b/tests/datasets-05-state/test.yaml
index 0ccb0b9f6..adc45d9fc 100644
--- a/tests/datasets-05-state/test.yaml
+++ b/tests/datasets-05-state/test.yaml
@@ -4,11 +4,8 @@ requires:
   files:
     - src/datasets.c
 
-command: |
-  ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/classification.config"    \
-      --set reference-config-file="${SRCDIR}/reference.config" -l ${OUTPUT_DIR}         \
-      -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules  \
-      --data-dir="${OUTPUT_DIR}"
+args:
+  - --data-dir=${OUTPUT_DIR}
 
 checks:
   - file-compare:
diff --git a/tests/datasets-06-state-long/test.yaml b/tests/datasets-06-state-long/test.yaml
index 04d01fe40..1b54d8c7a 100644
--- a/tests/datasets-06-state-long/test.yaml
+++ b/tests/datasets-06-state-long/test.yaml
@@ -4,11 +4,8 @@ requires:
   files:
     - src/datasets.c
 
-command: |
-  ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/classification.config"    \
-      --set reference-config-file="${SRCDIR}/reference.config" -l ${OUTPUT_DIR}         \
-      -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules  \
-      --data-dir="${OUTPUT_DIR}"
+args:
+  - --data-dir=${OUTPUT_DIR}
 
 checks:
   - shell:
diff --git a/tests/datasets-state-isnotset/test.yaml b/tests/datasets-state-isnotset/test.yaml
index c4d663c53..410d19976 100644
--- a/tests/datasets-state-isnotset/test.yaml
+++ b/tests/datasets-state-isnotset/test.yaml
@@ -4,12 +4,10 @@ requires:
     - HAVE_NSS
     - HAVE_LIBJANSSON
 
+pcap: false
 
-command: |
-  ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/classification.config"    \
-      --set reference-config-file="${SRCDIR}/reference.config" -l ${OUTPUT_DIR}         \
-      -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/../datasets-05-state/input.pcap -S ${TEST_DIR}/test.rules  \
-      --data-dir="${OUTPUT_DIR}"
+args:
+  - --data-dir=${OUTPUT_DIR}
 
 checks:
   - filter: