From c30fc3d731b711847fce7910e95d1c217886cb09 Mon Sep 17 00:00:00 2001
From: Arturo Borrero <arturo.borrero.glez@gmail.com>
Date: Thu, 14 Apr 2016 21:47:05 +0200
Subject: tests/shell: delete tempfile failover in testcases

It seems both Debian/Fedora (and derivates) contains mktemp (from the coreutils
package) so it makes no sense to have this failover, which looks buggy also.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/testcases/nft-f/0001define_slash_0  | 8 +-------
 tests/shell/testcases/nft-f/0002rollback_rule_0 | 8 +-------
 tests/shell/testcases/nft-f/0003rollback_jump_0 | 8 +-------
 tests/shell/testcases/nft-f/0004rollback_set_0  | 8 +-------
 tests/shell/testcases/nft-f/0005rollback_map_0  | 8 +-------
 5 files changed, 5 insertions(+), 35 deletions(-)

(limited to 'tests/shell/testcases/nft-f')

diff --git a/tests/shell/testcases/nft-f/0001define_slash_0 b/tests/shell/testcases/nft-f/0001define_slash_0
index 4ce7089c..bf0763d4 100755
--- a/tests/shell/testcases/nft-f/0001define_slash_0
+++ b/tests/shell/testcases/nft-f/0001define_slash_0
@@ -2,13 +2,7 @@
 
 # tests for commit 85d6803 (parser_bison: initializer_expr must use rhs_expr)
 
-MKTEMP=$(which mktemp)
-if [ -x $MKTEMP ] ; then
-	tmpfile=$(${MKTEMP})
-else
-	tmpfile=$(/tmp/${RANDOM})
-fi
-
+tmpfile=$(mktemp)
 if [ ! -w $tmpfile ] ; then
 	echo "Failed to create tmp file" >&2
 	exit 0
diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0
index a3f66760..b1e224c3 100755
--- a/tests/shell/testcases/nft-f/0002rollback_rule_0
+++ b/tests/shell/testcases/nft-f/0002rollback_rule_0
@@ -3,13 +3,7 @@
 # test a kernel rollback operation
 # fail reason: rule
 
-MKTEMP=$(which mktemp)
-if [ -x $MKTEMP ] ; then
-	tmpfile=$(${MKTEMP})
-else
-	tmpfile=$(/tmp/${RANDOM})
-fi
-
+tmpfile=$(mktemp)
 if [ ! -w $tmpfile ] ; then
 	echo "Failed to create tmp file" >&2
 	exit 0
diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0
index b3ebe949..567a70e7 100755
--- a/tests/shell/testcases/nft-f/0003rollback_jump_0
+++ b/tests/shell/testcases/nft-f/0003rollback_jump_0
@@ -3,13 +3,7 @@
 # test a kernel rollback operation
 # fail reason: invalid jump
 
-MKTEMP=$(which mktemp)
-if [ -x $MKTEMP ] ; then
-	tmpfile=$(${MKTEMP})
-else
-	tmpfile=$(/tmp/${RANDOM})
-fi
-
+tmpfile=$(mktemp)
 if [ ! -w $tmpfile ] ; then
 	echo "Failed to create tmp file" >&2
 	exit 0
diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0
index 55043ef3..3521aebd 100755
--- a/tests/shell/testcases/nft-f/0004rollback_set_0
+++ b/tests/shell/testcases/nft-f/0004rollback_set_0
@@ -3,13 +3,7 @@
 # test a kernel rollback operation
 # fail reason: invalid set
 
-MKTEMP=$(which mktemp)
-if [ -x $MKTEMP ] ; then
-	tmpfile=$(${MKTEMP})
-else
-	tmpfile=$(/tmp/${RANDOM})
-fi
-
+tmpfile=$(mktemp)
 if [ ! -w $tmpfile ] ; then
 	echo "Failed to create tmp file" >&2
 	exit 0
diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0
index 38018f66..21b6a637 100755
--- a/tests/shell/testcases/nft-f/0005rollback_map_0
+++ b/tests/shell/testcases/nft-f/0005rollback_map_0
@@ -3,13 +3,7 @@
 # test a kernel rollback operation
 # fail reason: invalid map
 
-MKTEMP=$(which mktemp)
-if [ -x $MKTEMP ] ; then
-	tmpfile=$(${MKTEMP})
-else
-	tmpfile=$(/tmp/${RANDOM})
-fi
-
+tmpfile=$(mktemp)
 if [ ! -w $tmpfile ] ; then
 	echo "Failed to create tmp file" >&2
 	exit 0
-- 
cgit v1.2.3