From: Shivani Bhardwaj <shivanib134@gmail.com>
Date: Thu, 11 Jul 2019 12:32:32 +0000 (+0530)
Subject: run: Allow tests in subdirectories
X-Git-Tag: suricata-6.0.4~404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98f6c76e7ce138775cee705a0acceb3b170a369;p=thirdparty%2Fsuricata-verify.git

run: Allow tests in subdirectories

With this patch it is now possible to have subdirectories with tests
under the main test directory. This shall help tests become more
organized.
---

diff --git a/run.py b/run.py
index f9907bf54..01ee8bc30 100755
--- a/run.py
+++ b/run.py
@@ -803,8 +803,11 @@ def main():
         if dirpath == tdir:
             continue
 
-        # We only want to go one level deep.
-        dirnames[0:] = []
+        # Check if there are sub-test directories
+        if "test.yaml" in filenames or "check.sh" in filenames:
+            dirnames[0:] = []
+        else:
+            continue
 
         if not args.patterns:
             tests.append(dirpath)