0b7af917e2
- Drop patches incorporated into upstream - Still adds the various DASD patches
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 81faa9b3b957781871ec3ef0df6e357388f857a1 Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@redhat.com>
|
|
Date: Wed, 12 Sep 2012 20:34:48 +0200
|
|
Subject: [PATCH 22/89] tests: update t7000-scripting.sh to avoid new FP
|
|
|
|
* tests/t7000-scripting.sh: Use -34s as the endpoint, not -1s,
|
|
to avoid a spurious difference. Also, remove quoting artifacts.
|
|
---
|
|
tests/t7000-scripting.sh | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/t7000-scripting.sh b/tests/t7000-scripting.sh
|
|
index e64814b..859acda 100755
|
|
--- a/tests/t7000-scripting.sh
|
|
+++ b/tests/t7000-scripting.sh
|
|
@@ -47,7 +47,7 @@ for mkpart in mkpart; do
|
|
dd if=/dev/zero of=testfile bs=${ss}c count=$N 2> /dev/null || fail=1
|
|
|
|
# Test the scripting mode of $mkpart.
|
|
- parted -s testfile -- mklabel gpt "$mkpart" p-name ext3 1s -1s > out 2>&1
|
|
+ parted -s testfile -- mklabel gpt "$mkpart" p-name ext3 1s -34s > out 2>&1
|
|
test $? = 1 || fail=1
|
|
|
|
# Compare the real error and the expected one
|
|
@@ -60,8 +60,8 @@ for mkpart in mkpart; do
|
|
dd if=/dev/zero of=testfile bs=${ss}c count=$N 2> /dev/null || fail=1
|
|
# Test the interactive mode of $mkpart
|
|
echo n | \
|
|
- parted ---pretend-input-tty testfile \
|
|
- "mklabel gpt '$mkpart' p-name ext3 1s -1s" > out 2>&1 && fail=1
|
|
+ parted ---pretend-input-tty -- testfile \
|
|
+ mklabel gpt $mkpart p-name ext3 1s -34s > out 2>&1 && fail=1
|
|
|
|
# We have to format the output before comparing.
|
|
# normalize the actual output
|
|
--
|
|
1.8.5.3
|
|
|