From 60e997a3fd166ebbc8035b8c4f0f3ed077ebbcd5 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Wed, 8 Nov 2023 15:40:31 +0100
Subject: [PATCH] btest: Move zam/basic.test into opt/basic.test, update
 TestDirs

It seems "opt" can and should run unconditionally. The "misc" dir was
definitely an oversight.
---
 testing/btest/Baseline/{zam.basic => opt.basic}/conn.log | 0
 testing/btest/Baseline/{zam.basic => opt.basic}/dns.log  | 0
 testing/btest/Baseline/{zam.basic => opt.basic}/http.log | 0
 testing/btest/btest.cfg                                  | 2 +-
 testing/btest/{zam/basic.test => opt/basic.zeek}         | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename testing/btest/Baseline/{zam.basic => opt.basic}/conn.log (100%)
 rename testing/btest/Baseline/{zam.basic => opt.basic}/dns.log (100%)
 rename testing/btest/Baseline/{zam.basic => opt.basic}/http.log (100%)
 rename testing/btest/{zam/basic.test => opt/basic.zeek} (100%)

diff --git a/testing/btest/Baseline/zam.basic/conn.log b/testing/btest/Baseline/opt.basic/conn.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/conn.log
rename to testing/btest/Baseline/opt.basic/conn.log
diff --git a/testing/btest/Baseline/zam.basic/dns.log b/testing/btest/Baseline/opt.basic/dns.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/dns.log
rename to testing/btest/Baseline/opt.basic/dns.log
diff --git a/testing/btest/Baseline/zam.basic/http.log b/testing/btest/Baseline/opt.basic/http.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/http.log
rename to testing/btest/Baseline/opt.basic/http.log
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index 3456accdd8..c99919362b 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -4,7 +4,7 @@
 build_dir = build
 
 [btest]
-TestDirs    = af_packet doc bifs language core scripts coverage signatures plugins broker spicy supervisor telemetry javascript
+TestDirs    = af_packet doc bifs language core scripts coverage signatures plugins broker spicy supervisor telemetry javascript misc opt
 TmpDir      = %(testbase)s/.tmp
 BaselineDir = %(testbase)s/Baseline
 IgnoreDirs  = .svn CVS .tmp
diff --git a/testing/btest/zam/basic.test b/testing/btest/opt/basic.zeek
similarity index 100%
rename from testing/btest/zam/basic.test
rename to testing/btest/opt/basic.zeek