Check for mktemp executable in all shell tests.

dns-stats · May 3, 2018 · c08c8fa · c08c8fa
1 parent c0748e9
commit c08c8fa
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 0 deletions.
diff --git a/test-scripts/check-config-info.sh b/test-scripts/check-config-info.sh
@@ -11,6 +11,7 @@ INSP=./inspector
 DATAFILE=./dns.pcap
 
 command -v grep > /dev/null 2>&1 || { echo "No grep, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "check-config-info.XXXXXX"`
 

diff --git a/test-scripts/check-outputs.sh b/test-scripts/check-outputs.sh
@@ -9,6 +9,8 @@
 COMP=./compactor
 DATAFILE=./malformed.pcap
 
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
+
 tmpdir=`mktemp -d -t "check-outputs.XXXXXX"`
 
 cleanup()

diff --git a/test-scripts/check-testcontent.sh b/test-scripts/check-testcontent.sh
@@ -27,6 +27,7 @@ DATAQR=$srcdir/test-scripts/testcontent.debugqr
 command -v $CBOR2DIAG > /dev/null 2>&1 || { echo "No cbor2diag, skipping test." >&2; exit 77; }
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
 command -v diff > /dev/null 2>&1 || { echo "No diff, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "check-testcontent.XXXXXX"`
 

diff --git a/test-scripts/inspector-outputs.sh b/test-scripts/inspector-outputs.sh
@@ -11,6 +11,7 @@ INSP=./inspector
 DATAFILE=./dns.pcap
 
 command -v diff > /dev/null 2>&1 || { echo "No diff, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "inspector-outputs.XXXXXX"`
 

diff --git a/test-scripts/same-file-output.sh b/test-scripts/same-file-output.sh
@@ -15,6 +15,7 @@ GOLD_PCAPFILE=./gold.pcap
 GOLD_INFOFILE=$srcdir/test-scripts/gold.pcap.info
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "same-file-output.XXXXXX"`
 

diff --git a/test-scripts/same-output-gzip.sh b/test-scripts/same-output-gzip.sh
@@ -14,6 +14,7 @@ DATAFILE=./dns.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
 command -v gunzip > /dev/null 2>&1 || { echo "No gunzip, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "same-output-gzip.XXXXXX"`
 

diff --git a/test-scripts/same-output-xz.sh b/test-scripts/same-output-xz.sh
@@ -13,6 +13,7 @@ DATAFILE=./dns.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
 command -v unxz > /dev/null 2>&1 || { echo "No unxz, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "same-output-xz.XXXXXX"`
 

diff --git a/test-scripts/same-output.sh b/test-scripts/same-output.sh
@@ -10,6 +10,7 @@ DNSCAP=./compactor
 DATAFILE=./dns.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 #set -x
 

diff --git a/test-scripts/same-pcap-cbor-pcap.sh b/test-scripts/same-pcap-cbor-pcap.sh
@@ -11,6 +11,7 @@ INSP=./inspector
 DATAFILE=./gold.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "same-pcap.XXXXXX"`
 

diff --git a/test-scripts/same-qr-dump.sh b/test-scripts/same-qr-dump.sh
@@ -12,6 +12,7 @@ INSP=./inspector
 DATAFILE=./dns.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "same-qr-dump.XXXXXX"`
 

diff --git a/test-scripts/same-tshark-output.sh b/test-scripts/same-tshark-output.sh
@@ -16,6 +16,7 @@ INPUT_FILES="matching.pcap unmatched.pcap"
 #set -x
 
 command -v tshark > /dev/null 2>&1 || { echo "No tshark, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 if [ -z "$1" ] ; then
     echo "Using default input"

diff --git a/test-scripts/tmp-output.sh b/test-scripts/tmp-output.sh
@@ -10,6 +10,8 @@ COMP=./compactor
 INSP=./inspector
 DATAFILE=./dns.pcap
 
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
+
 tmpdir=`mktemp -d -t "tmp-output.XXXXXX"`
 
 cleanup()

diff --git a/test-scripts/verify-cbor02.sh b/test-scripts/verify-cbor02.sh
@@ -12,6 +12,7 @@ CBORFILE=./gold.cbor02
 PCAPFILE=./gold.pcap
 
 command -v cmp > /dev/null 2>&1 || { echo "No cmp, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "verify-cbor02.XXXXXX"`
 

diff --git a/test-scripts/verify-cddl.sh b/test-scripts/verify-cddl.sh
@@ -11,6 +11,7 @@ DATAFILE=./gold.pcap
 CDDL=$srcdir/doc/c-dns-working.cddl
 
 command -v cddl > /dev/null 2>&1 || { echo "No cddl, skipping test." >&2; exit 77; }
+command -v mktemp > /dev/null 2>&1 || { echo "No mktemp, skipping test." >&2; exit 77; }
 
 tmpdir=`mktemp -d -t "verify-cddl.XXXXXX"`