From: Loïc Minier <l...@dooz.org>
Rename FILE to OLDSYS_PRESEED_FILE to avoid potential clashes and use a
new OLDSYS_PRESEED_TEST_OUTPUT specifically for the output of tests,
since some tests don't actually relate to preseeding.
Signed-off-by: Loïc Minier <l...@debian.org>
---
functions | 2 +-
oldsys-preseed | 2 +-
tests/do-test | 13 +++++++------
tests/misc/gateway.test | 6 ++----
tests/misc/hostname.test | 6 ++----
5 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/functions b/functions
index e6a828c..9ac20e5 100644
--- a/functions
+++ b/functions
@@ -177,7 +177,7 @@ parse_sib_conf() {
# $3 = value
add() {
if [ -n "$3" -o "$2" = "note" ]; then
- echo "d-i $1 $2 $3" | sed 's/ *$//' >> "$FILE"
+ echo "d-i $1 $2 $3" | sed 's/ *$//' >> "$OLDSYS_PRESEED_FILE"
fi
}
diff --git a/oldsys-preseed b/oldsys-preseed
index 298b436..97a8304 100755
--- a/oldsys-preseed
+++ b/oldsys-preseed
@@ -24,7 +24,7 @@ exit_unknown() {
# is not optimal but which will ensure that network-console is reached
# without prompting for user input.
NONINTERACTIVE="yes"
-FILE="/preseed.cfg"
+OLDSYS_PRESEED_FILE="/preseed.cfg"
case "`archdetect`" in
arm*/ixp4xx)
diff --git a/tests/do-test b/tests/do-test
index 94638e8..cef8408 100755
--- a/tests/do-test
+++ b/tests/do-test
@@ -14,18 +14,19 @@ NONINTERACTIVE="yes"
test="$1"
DIR=$PWD
TEST_DIR=$PWD/$(dirname "$test")
-FILE="$(tempfile)"
+OLDSYS_PRESEED_TEST_OUTPUT="$(tempfile)"
+OLDSYS_PRESEED_FILE="$OLDSYS_PRESEED_TEST_OUTPUT"
unset HOSTNAME
-. $test.test "$FILE"
+. $test.test
cd $DIR
-if $(cmp -s $test.preseed "$FILE"); then
- rm -f "$FILE"
+if $(cmp -s $test.preseed "$OLDSYS_PRESEED_TEST_OUTPUT"); then
+ rm -f "$OLDSYS_PRESEED_TEST_OUTPUT"
exit 0
else
if [ $TEST_VERBOSE ]; then
- diff -urN $test.preseed "$FILE" 1>&2
+ diff -urN $test.preseed "$OLDSYS_PRESEED_TEST_OUTPUT" 1>&2
fi
- rm -f "$FILE"
+ rm -f "$OLDSYS_PRESEED_TEST_OUTPUT"
exit 1
fi
diff --git a/tests/misc/gateway.test b/tests/misc/gateway.test
index 7e1f43d..7a03f27 100755
--- a/tests/misc/gateway.test
+++ b/tests/misc/gateway.test
@@ -1,12 +1,10 @@
#!/bin/sh
-tmp="$1"
-
check_gateway() {
if ! address_is_in "$1" "$2" "$3" ; then
- echo "Invalid gateway $2" >> $tmp
+ echo "Invalid gateway $2" >> "$OLDSYS_PRESEED_TEST_OUTPUT"
else
- echo "Valid gateway $2" >> $tmp
+ echo "Valid gateway $2" >> "$OLDSYS_PRESEED_TEST_OUTPUT"
fi
}
diff --git a/tests/misc/hostname.test b/tests/misc/hostname.test
index 8db5eef..99df183 100755
--- a/tests/misc/hostname.test
+++ b/tests/misc/hostname.test
@@ -1,12 +1,10 @@
#!/bin/sh
-tmp="$1"
-
check_hostname() {
if ! verify_hostname "$1"; then
- echo "Invalid name $1" >> $tmp
+ echo "Invalid name $1" >> "$OLDSYS_PRESEED_TEST_OUTPUT"
else
- echo "Valid name $1" >> $tmp
+ echo "Valid name $1" >> "$OLDSYS_PRESEED_TEST_OUTPUT"
fi
}
--
1.7.5.4
--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/1313532321-13642-4-git-send-email-l...@debian.org
