tests/lua: move tests using SCFlow funcs to *-pre8

Task #7489

diff --git a/tests/lua-output-streaming/expected/6-172.16.1.68-162.209.114.75-58384-80 b/tests/lua-output-streaming-pre8/expected/6-172.16.1.68-162.209.114.75-58384-80
similarity index 100%
rename from tests/lua-output-streaming/expected/6-172.16.1.68-162.209.114.75-58384-80
rename to tests/lua-output-streaming-pre8/expected/6-172.16.1.68-162.209.114.75-58384-80

diff --git a/tests/lua-output-streaming/expected/http-6-172.16.1.68-162.209.114.75-58384-80 b/tests/lua-output-streaming-pre8/expected/http-6-172.16.1.68-162.209.114.75-58384-80
similarity index 100%
rename from tests/lua-output-streaming/expected/http-6-172.16.1.68-162.209.114.75-58384-80
rename to tests/lua-output-streaming-pre8/expected/http-6-172.16.1.68-162.209.114.75-58384-80

diff --git a/tests/lua-output-streaming/streaming-http.lua b/tests/lua-output-streaming-pre8/streaming-http.lua
similarity index 100%
rename from tests/lua-output-streaming/streaming-http.lua
rename to tests/lua-output-streaming-pre8/streaming-http.lua

diff --git a/tests/lua-output-streaming/streaming-tcp.lua b/tests/lua-output-streaming-pre8/streaming-tcp.lua
similarity index 100%
rename from tests/lua-output-streaming/streaming-tcp.lua
rename to tests/lua-output-streaming-pre8/streaming-tcp.lua

diff --git a/tests/lua-output-streaming/suricata.yaml b/tests/lua-output-streaming-pre8/suricata.yaml
similarity index 95%
rename from tests/lua-output-streaming/suricata.yaml
rename to tests/lua-output-streaming-pre8/suricata.yaml
index 73365db0ba89fa7cac10a028e77eb0ca9404b3e5..609877b85ddac79e4765cde0d6e3b3d2ab214f28 100644 (file)
--- a/tests/lua-output-streaming/suricata.yaml
+++ b/tests/lua-output-streaming-pre8/suricata.yaml
@@ -1,6 +1,8 @@
 %YAML 1.1
 ---
 
+include: ../../etc/suricata-4.0.3.yaml
+
 outputs:
   - lua:
       enabled: yes

diff --git a/tests/lua-output-streaming/test.yaml b/tests/lua-output-streaming-pre8/test.yaml
similarity index 95%
rename from tests/lua-output-streaming/test.yaml
rename to tests/lua-output-streaming-pre8/test.yaml
index b7d11de1f83565bb3581536700ac206d41f475d1..95c926b117bdc4375811c3fd8f30699a5397a986 100644 (file)
--- a/tests/lua-output-streaming/test.yaml
+++ b/tests/lua-output-streaming-pre8/test.yaml
@@ -1,6 +1,7 @@
 requires:
   features:
     - HAVE_LUA
+  lt-version: 8
 
 pcap: ../filestore-v2.1-forced/suricata-update-pdf.pcap
 

diff --git a/tests/lua-scflowstats/README.md b/tests/lua-scflowstats-pre8/README.md
similarity index 100%
rename from tests/lua-scflowstats/README.md
rename to tests/lua-scflowstats-pre8/README.md

diff --git a/tests/lua-scflowstats/expected/lua-scflowstats.log b/tests/lua-scflowstats-pre8/expected/lua-scflowstats.log
similarity index 100%
rename from tests/lua-scflowstats/expected/lua-scflowstats.log
rename to tests/lua-scflowstats-pre8/expected/lua-scflowstats.log

diff --git a/tests/lua-scflowstats/lua-scflowstats.lua b/tests/lua-scflowstats-pre8/lua-scflowstats.lua
similarity index 100%
rename from tests/lua-scflowstats/lua-scflowstats.lua
rename to tests/lua-scflowstats-pre8/lua-scflowstats.lua

diff --git a/tests/lua-scflowstats/suricata.yaml b/tests/lua-scflowstats-pre8/suricata.yaml
similarity index 74%
rename from tests/lua-scflowstats/suricata.yaml
rename to tests/lua-scflowstats-pre8/suricata.yaml
index c969224bc08b2e26ce25502238948fd217314f8c..dff269b03610e0835f7cedb1d149f44fe4a9b703 100644 (file)
--- a/tests/lua-scflowstats/suricata.yaml
+++ b/tests/lua-scflowstats-pre8/suricata.yaml
@@ -1,6 +1,8 @@
 %YAML 1.1
 ---
 
+include: ../../etc/suricata-4.0.3.yaml
+
 outputs:
   - lua:
       enabled: yes

diff --git a/tests/lua-scflowstats/test.yaml b/tests/lua-scflowstats-pre8/test.yaml
similarity index 93%
rename from tests/lua-scflowstats/test.yaml
rename to tests/lua-scflowstats-pre8/test.yaml
index 862c74471c7d9c4ff75c1e19d7674d47343da627..5261b2fdb3d769fcdf185481bd9a1577920dd997 100644 (file)
--- a/tests/lua-scflowstats/test.yaml
+++ b/tests/lua-scflowstats-pre8/test.yaml
@@ -3,6 +3,7 @@ pcap: ../lua-output-http/input.pcap
 requires:
   features:
     - HAVE_LUA
+  lt-version: 8
 
 checks:
 

diff --git a/tests/lua-scflowtuple/README.md b/tests/lua-scflowtuple-pre8/README.md
similarity index 100%
rename from tests/lua-scflowtuple/README.md
rename to tests/lua-scflowtuple-pre8/README.md

diff --git a/tests/lua-scflowtuple/expected/scflow-tuple.log b/tests/lua-scflowtuple-pre8/expected/scflow-tuple.log
similarity index 100%
rename from tests/lua-scflowtuple/expected/scflow-tuple.log
rename to tests/lua-scflowtuple-pre8/expected/scflow-tuple.log

diff --git a/tests/lua-scflowtuple/scflowtuple.lua b/tests/lua-scflowtuple-pre8/scflowtuple.lua
similarity index 100%
rename from tests/lua-scflowtuple/scflowtuple.lua
rename to tests/lua-scflowtuple-pre8/scflowtuple.lua

diff --git a/tests/lua-scflowtuple/suricata.yaml b/tests/lua-scflowtuple-pre8/suricata.yaml
similarity index 74%
rename from tests/lua-scflowtuple/suricata.yaml
rename to tests/lua-scflowtuple-pre8/suricata.yaml
index 4245578af1cc66d7525fd31663fb1a036894f513..6ca8950e03cd8af0537c4a57e448095996c7c4af 100644 (file)
--- a/tests/lua-scflowtuple/suricata.yaml
+++ b/tests/lua-scflowtuple-pre8/suricata.yaml
@@ -1,6 +1,8 @@
 %YAML 1.1
 ---
 
+include: ../../etc/suricata-4.0.3.yaml
+
 outputs:
   - lua:
       enabled: yes

diff --git a/tests/lua-scflowtuple/test.yaml b/tests/lua-scflowtuple-pre8/test.yaml
similarity index 93%
rename from tests/lua-scflowtuple/test.yaml
rename to tests/lua-scflowtuple-pre8/test.yaml
index 523c245246066e3fe4913d0d2a97a2c65ad19189..9d4ef739bc40b9673426e0275b1c22abaecb39c5 100644 (file)
--- a/tests/lua-scflowtuple/test.yaml
+++ b/tests/lua-scflowtuple-pre8/test.yaml
@@ -3,6 +3,7 @@ pcap: ../lua-output-http/input.pcap
 requires:
   features:
     - HAVE_LUA
+  lt-version: 8
 
 checks:
   - file-compare: