From: Jason Ish <jason.ish@oisf.net>
Date: Tue, 26 Oct 2021 15:45:43 +0000 (-0600)
Subject: check-eve: print full filename being tested
X-Git-Tag: suricata-6.0.4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7578533ecc0282f7d69649bcff5eb50420027a7;p=thirdparty%2Fsuricata-verify.git

check-eve: print full filename being tested

With check-eve it makes more sense to print the full filename
being tested rather than just the test name.  As it is possible
that more than the expected eve.json is being tested.
---

diff --git a/check-eve.py b/check-eve.py
index 0c571d6bb..18e08e9a9 100755
--- a/check-eve.py
+++ b/check-eve.py
@@ -35,10 +35,6 @@ def validate_json(args, dirpath, schema, isDirectory):
     if isDirectory:
         json_filename = os.path.join(dirpath, 'eve.json')
         
-    testname = dirpath
-    if "suricata-verify" in dirpath:
-        testname = os.path.basename(os.path.dirname(dirpath))
-
     status = "OK"
     errors = []
 
@@ -53,12 +49,12 @@ def validate_json(args, dirpath, schema, isDirectory):
     
     if not args.quiet:
         if status == "FAIL":
-            print("===> %s: FAIL " % testname)
+            print("===> %s: FAIL " % json_filename)
 
             for err in errors:
                 print(err)
         elif args.verbose:
-            print("===> %s: OK " % testname)
+            print("===> %s: OK " % json_filename)
 
     return status