Make the NFLOG test case unconditional

There is no more HAVE_PCAP_NFLOG_H macro to test.

libpcap has support for NFLOG in current in 1.8.1 and in old releases
1.7.4, 1.6.2 and 1.5.3.

Thus there should be no problem to always do the test.

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 39e60c1095700158451eaf6d50961f12aa0c334e..002a963ac0a29e99a050e5fd018caaf4defa0417 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -211,7 +211,8 @@ geonet-calm-fast    geonet_and_calm_fast.pcap       geonet_and_calm_fast.out        -vv
 m3ua isup.pcap isup.out
 m3ua-vv isup.pcap isupvv.out -vv
 
-# NFLOG test case moved to nflog-e.sh
+# NFLOG test case
+nflog-e nflog.pcap nflog-e.out -e
 
 # syslog test case
 syslog-v       syslog_udp.pcap         syslog-v.out            -v

diff --git a/tests/nflog-e.sh b/tests/nflog-e.sh
deleted file mode 100755 (executable)
index 5b5b66c..0000000
--- a/tests/nflog-e.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-exitcode=0
-
-# NFLOG support depends on both DLT_NFLOG and working <pcap/nflog.h>
-
-if grep '^#define HAVE_PCAP_NFLOG_H 1$' ../config.h >/dev/null
-then
-       passed=`cat .passed`
-       failed=`cat .failed`
-       if ./TESTonce nflog-e nflog.pcap nflog-e.out '-e'
-       then
-               passed=`expr $passed + 1`
-               echo $passed >.passed
-       else
-               failed=`expr $failed + 1`
-               echo $failed >.failed
-               exitcode=1
-       fi
-else
-       printf '    %-35s: TEST SKIPPED (compiled w/o NFLOG)\n' 'nflog-e'
-fi
-
-exit $exitcode