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 2a82606d3f12c556f934b3c660065c8df08175a5..029c35a407796953bfd97a893a39c7f8aa0631ab 100644 (file)
--- 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 0ccb0b9f6f399de07d41e9434af817ee343b4725..adc45d9fcd951f202d5c352a143436a8426a132e 100644 (file)
--- 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 04d01fe4077dc3dc3b6254194624e7e5ad228404..1b54d8c7a48e0f7c9039cccf6fbba42a4708f1d4 100644 (file)
--- 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 c4d663c53732256525d2e2379f646bd20384e179..410d199762e34b396c65f3c397b3f07e2cba5b66 100644 (file)
--- 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: