runtime fixups

diff --git a/etc/suricata-3.1.2.yaml b/etc/suricata-3.1.2.yaml
index 7850fe933177dfd0b2efc705086b810910205bac..d829326c53fdbc8f402cf989ca699511e61db1bc 100644 (file)
--- a/etc/suricata-3.1.2.yaml
+++ b/etc/suricata-3.1.2.yaml
@@ -100,8 +100,8 @@ rule-files:
 # - modbus-events.rules  # available in suricata sources under rules dir
 # - app-layer-events.rules  # available in suricata sources under rules dir
 
-classification-file: /home/jason/projects/oisf/etc/suricata/classification.config
-reference-config-file: /home/jason/projects/oisf/etc/suricata/reference.config
+classification-file: ./classification.config
+reference-config-file: ./reference.config
 # threshold-file: /home/jason/projects/oisf/etc/suricata/threshold.config
 
 

diff --git a/run.sh b/run.sh
index 684b3b8012542c7c1ecc48a988672036f89fceea..ca157d7ded77fccd8893ae8cdfa3c8b47b2199e9 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -217,7 +217,7 @@ run_and_check() {
 
     # If test has its own run script, just use that.
     if [ -e "${tdir}/run.sh" ]; then
-       if ! "${tdir}/run.sh"; then
+       if ! TEST_DIR="${tdir}" "${tdir}/run.sh"; then
            echo "===> ${t}: FAIL"
            return 1
        fi