|
 |
0cb0b9 |
From cfcfadac1d61093f900d1903f580818d244479ad Mon Sep 17 00:00:00 2001
|
|
|
0cb0b9 |
From: Mike Fleetwood <mike.fleetwood@googlemail.com>
|
|
|
0cb0b9 |
Date: Sat, 1 Oct 2016 16:40:17 +0100
|
|
|
0cb0b9 |
Subject: [PATCH 46/53] tests: t3310-flags.sh: Stop excluding certain flags
|
|
|
0cb0b9 |
from being tested
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
Also grep for whole words, grep -w, to avoid flag 'boot' being matched
|
|
|
0cb0b9 |
as a substring of flag 'legacy_boot'.
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
|
|
0cb0b9 |
---
|
|
|
0cb0b9 |
tests/t3310-flags.sh | 9 ++-------
|
|
|
0cb0b9 |
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
diff --git a/tests/t3310-flags.sh b/tests/t3310-flags.sh
|
|
|
0cb0b9 |
index 85a673a..5cbf2da 100644
|
|
|
0cb0b9 |
--- a/tests/t3310-flags.sh
|
|
|
0cb0b9 |
+++ b/tests/t3310-flags.sh
|
|
|
0cb0b9 |
@@ -49,15 +49,10 @@ for table_type in msdos gpt; do
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
for mode in on_only on_and_off ; do
|
|
|
0cb0b9 |
for flag in $flags; do
|
|
|
0cb0b9 |
-
|
|
|
0cb0b9 |
- # Exclude the supplemental flags.
|
|
|
0cb0b9 |
- # These are not boolean, like the others.
|
|
|
0cb0b9 |
- case $flag in boot|lba|hidden) continue;; esac
|
|
|
0cb0b9 |
-
|
|
|
0cb0b9 |
# Turn on each flag, one at a time.
|
|
|
0cb0b9 |
parted -m -s $dev set 1 $flag on unit s print > raw 2> err || fail=1
|
|
|
0cb0b9 |
extract_flags raw > out
|
|
|
0cb0b9 |
- grep -F "$flag" out \
|
|
|
0cb0b9 |
+ grep -w "$flag" out \
|
|
|
0cb0b9 |
|| { warn_ "$ME_: $table_type: flag '$flag' not turned on: $(cat out)"; fail=1; }
|
|
|
0cb0b9 |
compare /dev/null err || fail=1
|
|
|
0cb0b9 |
|
|
|
0cb0b9 |
@@ -65,7 +60,7 @@ for table_type in msdos gpt; do
|
|
|
0cb0b9 |
# Turn it off
|
|
|
0cb0b9 |
parted -m -s $dev set 1 $flag off unit s print > raw 2> err || fail=1
|
|
|
0cb0b9 |
extract_flags raw > out
|
|
|
0cb0b9 |
- grep -F "$flag" out \
|
|
|
0cb0b9 |
+ grep -w "$flag" out \
|
|
|
0cb0b9 |
&& { warn_ "$ME_: $table_type: flag '$flag' not turned off: $(cat out)"; fail=1; }
|
|
|
0cb0b9 |
compare /dev/null err || fail=1
|
|
|
0cb0b9 |
fi
|
|
|
0cb0b9 |
--
|
|
|
0cb0b9 |
2.7.4
|
|
|
0cb0b9 |
|