|
 |
0cb0b9 |
From 3228fcc714347701f48034288b5fa98c6bb0a50d Mon Sep 17 00:00:00 2001
|
|
|
0cb0b9 |
From: "Brian C. Lane" <bcl@redhat.com>
|
|
|
0cb0b9 |
Date: Thu, 22 Dec 2016 16:59:27 -0800
|
|
|
0cb0b9 |
Subject: [PATCH 63/75] tests: Update t0220 and t0280 for the swap flag.
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
---
|
|
|
0cb0b9 |
tests/t0220-gpt-msftres.sh | 6 +++++-
|
|
|
0cb0b9 |
tests/t0280-gpt-corrupt.sh | 2 +-
|
|
|
0cb0b9 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
diff --git a/tests/t0220-gpt-msftres.sh b/tests/t0220-gpt-msftres.sh
|
|
|
0cb0b9 |
index 79518ae..6721a47 100755
|
|
|
0cb0b9 |
--- a/tests/t0220-gpt-msftres.sh
|
|
|
0cb0b9 |
+++ b/tests/t0220-gpt-msftres.sh
|
|
|
0cb0b9 |
@@ -56,7 +56,11 @@ printf "BYT;\n$dev:${n_sectors}s:file:$ss:$ss:gpt::;\n" > exp
|
|
|
0cb0b9 |
i=1
|
|
|
0cb0b9 |
for type in $fs_types; do
|
|
|
0cb0b9 |
end=$(expr $start + $part_size - 1)
|
|
|
0cb0b9 |
- case $type in fat*|NTFS) flag=msftdata;; *) flag=;; esac
|
|
|
0cb0b9 |
+ case $type in
|
|
|
0cb0b9 |
+ fat*|NTFS) flag=msftdata;;
|
|
|
0cb0b9 |
+ linux-swap) flag=swap;;
|
|
|
0cb0b9 |
+ *) flag=;;
|
|
|
0cb0b9 |
+ esac
|
|
|
0cb0b9 |
echo "$i:${start}s:${end}s:${part_size}s::$type:$flag;" >> exp || fail=1
|
|
|
0cb0b9 |
parted -s $dev mkpart p-name $type ${start}s ${end}s > err 2>&1 || fail=1
|
|
|
0cb0b9 |
compare /dev/null err || fail=1
|
|
|
0cb0b9 |
diff --git a/tests/t0280-gpt-corrupt.sh b/tests/t0280-gpt-corrupt.sh
|
|
|
0cb0b9 |
index a7c8d82..1b4d86b 100755
|
|
|
0cb0b9 |
--- a/tests/t0280-gpt-corrupt.sh
|
|
|
0cb0b9 |
+++ b/tests/t0280-gpt-corrupt.sh
|
|
|
0cb0b9 |
@@ -89,7 +89,7 @@ compare exp err || fail=1
|
|
|
0cb0b9 |
parted -m -s $dev u s print > out 2>&1 || fail=1
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
# check for expected output
|
|
|
0cb0b9 |
-printf "BYT;\nfile\n1:2048s:4095s:2048s::foo:;\n" > exp || fail=1
|
|
|
0cb0b9 |
+printf "BYT;\nfile\n1:2048s:4095s:2048s::foo:swap;\n" > exp || fail=1
|
|
|
0cb0b9 |
sed "s/.*gpt::;/file/" out > k && mv k out || fail=1
|
|
|
0cb0b9 |
compare exp out || fail=1
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
--
|
|
|
0cb0b9 |
2.9.3
|
|
|
0cb0b9 |
|