From: Victor Julien <victor@inliniac.net>
Date: Mon, 18 Oct 2021 13:16:57 +0000 (+0200)
Subject: ci: fix pcapng check on ubuntu
X-Git-Tag: suricata-6.0.4~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf8077262f74f07d187de0d4226aa29f66a45c9;p=thirdparty%2Fsuricata-verify.git

ci: fix pcapng check on ubuntu
---

diff --git a/pcapng-check.sh b/pcapng-check.sh
index 349853250..ba803d463 100755
--- a/pcapng-check.sh
+++ b/pcapng-check.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
   
-set -x
+#set -x
 
-PCAPNG=$(find tests/ -type f|xargs -L1 file|grep 'pcap-ng capture file')
-PCAPNGCNT=$(echo -n $PCAPNG | wc -l)
+PCAPNGCNT=$(find tests/ -type f|xargs -L1 file|grep -E "(pcap\-ng|pcapng) capture file"|wc -l)
 if [ $PCAPNGCNT -ne 0 ]; then
-    echo "pcap-ng tests found"
-    echo $PCAPNG
+    echo "$PCAPNGCNT pcap-ng files found:"
+    echo
+    find tests/ -type f|xargs -L1 file|grep -E "(pcap\-ng|pcapng) capture file"
+    echo
     echo "PCAP-NG files are currently not allowed for tests due to not "
     echo "all platforms supporting it at this time. Please convert the "
     echo "pcap file(s) to regular pcap format: "