From: Jason Ish <ish@unx.ca>
Date: Mon, 26 Sep 2016 16:45:15 +0000 (-0600)
Subject: rename rules.rules to test.rules
X-Git-Tag: suricata-3.2.1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be4cc2e322572495aa97066730d03cd273db917;p=thirdparty%2Fsuricata-verify.git

rename rules.rules to test.rules
---

diff --git a/run.sh b/run.sh
index 0a0a927cd..aff071f58 100755
--- a/run.sh
+++ b/run.sh
@@ -50,16 +50,22 @@ verify() {
     rm -rf ${dir}/output
     mkdir -p ${dir}/output
 
-    rules=/dev/null
-    if [ -e ${dir}/rules.rules ]; then
-	rules=${dir}/rules.rules
+    args=""
+
+    if [ -e ${dir}/suricata.yaml ]; then
+	args="${args} -c ${dir}/suricata.yaml"
+    else
+	args="${args} -c ./suricata.yaml"
+    fi
+
+    if [ -e ${dir}/test.rules ]; then
+	args="${args} -S ${dir}/test.rules"
     fi
 
     set +e
-    ${SURICATA} -c ${dir}/suricata.yaml \
+    ${SURICATA} ${args} \
         -r ${dir}/input.pcap \
 	-k none \
-	-S ${rules} \
 	--runmode=${RUNMODE} \
 	-l ${dir}/output \
 	--set "classification-file=${dir}/../etc/classification.config" \