]>
Commit | Line | Data |
---|---|---|
c886eb9d AM |
1 | From 3228fcc714347701f48034288b5fa98c6bb0a50d Mon Sep 17 00:00:00 2001 |
2 | From: "Brian C. Lane" <bcl@redhat.com> | |
3 | Date: Thu, 22 Dec 2016 16:59:27 -0800 | |
4 | Subject: [PATCH 63/75] tests: Update t0220 and t0280 for the swap flag. | |
5 | ||
6 | --- | |
7 | tests/t0220-gpt-msftres.sh | 6 +++++- | |
8 | tests/t0280-gpt-corrupt.sh | 2 +- | |
9 | 2 files changed, 6 insertions(+), 2 deletions(-) | |
10 | ||
11 | diff --git a/tests/t0220-gpt-msftres.sh b/tests/t0220-gpt-msftres.sh | |
12 | index 79518ae..6721a47 100755 | |
13 | --- a/tests/t0220-gpt-msftres.sh | |
14 | +++ b/tests/t0220-gpt-msftres.sh | |
15 | @@ -56,7 +56,11 @@ printf "BYT;\n$dev:${n_sectors}s:file:$ss:$ss:gpt::;\n" > exp | |
16 | i=1 | |
17 | for type in $fs_types; do | |
18 | end=$(expr $start + $part_size - 1) | |
19 | - case $type in fat*|NTFS) flag=msftdata;; *) flag=;; esac | |
20 | + case $type in | |
21 | + fat*|NTFS) flag=msftdata;; | |
22 | + linux-swap) flag=swap;; | |
23 | + *) flag=;; | |
24 | + esac | |
25 | echo "$i:${start}s:${end}s:${part_size}s::$type:$flag;" >> exp || fail=1 | |
26 | parted -s $dev mkpart p-name $type ${start}s ${end}s > err 2>&1 || fail=1 | |
27 | compare /dev/null err || fail=1 | |
28 | diff --git a/tests/t0280-gpt-corrupt.sh b/tests/t0280-gpt-corrupt.sh | |
29 | index a7c8d82..1b4d86b 100755 | |
30 | --- a/tests/t0280-gpt-corrupt.sh | |
31 | +++ b/tests/t0280-gpt-corrupt.sh | |
32 | @@ -89,7 +89,7 @@ compare exp err || fail=1 | |
33 | parted -m -s $dev u s print > out 2>&1 || fail=1 | |
34 | ||
35 | # check for expected output | |
36 | -printf "BYT;\nfile\n1:2048s:4095s:2048s::foo:;\n" > exp || fail=1 | |
37 | +printf "BYT;\nfile\n1:2048s:4095s:2048s::foo:swap;\n" > exp || fail=1 | |
38 | sed "s/.*gpt::;/file/" out > k && mv k out || fail=1 | |
39 | compare exp out || fail=1 | |
40 | ||
41 | -- | |
42 | 2.9.3 | |
43 |