summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak2013-02-07 10:31:49 +0100
committerKarel Zak2013-02-07 10:34:49 +0100
commit165bea4b10bdb0be916814f3b3a2f8a61189edfe (patch)
treee0cbf7431cfdd9458a63cc86230f4ee074f920fa /tests
parentlibblkid: make blkid_new_probe_from_filename() usable on whole-disk (diff)
downloadkernel-qcow2-util-linux-165bea4b10bdb0be916814f3b3a2f8a61189edfe.tar.gz
kernel-qcow2-util-linux-165bea4b10bdb0be916814f3b3a2f8a61189edfe.tar.xz
kernel-qcow2-util-linux-165bea4b10bdb0be916814f3b3a2f8a61189edfe.zip
libblkid: improve Silicon RAID prober
* count checksum from superblock * new (correct) superblock definition from dmraid Reported-by: Frank Hirtz <fhirtz@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/blkid/low-probe-silicon-raid2
-rwxr-xr-xtests/ts/blkid/low-probe1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/expected/blkid/low-probe-silicon-raid b/tests/expected/blkid/low-probe-silicon-raid
index c468056cd..35ab65fda 100644
--- a/tests/expected/blkid/low-probe-silicon-raid
+++ b/tests/expected/blkid/low-probe-silicon-raid
@@ -1,3 +1,3 @@
ID_FS_TYPE=silicon_medley_raid_member
ID_FS_USAGE=raid
-ID_FS_VERSION=0.0
+ID_FS_VERSION=2.3
diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe
index 9dc1a1781..0ecc664c3 100755
--- a/tests/ts/blkid/low-probe
+++ b/tests/ts/blkid/low-probe
@@ -37,7 +37,6 @@ for img in $(ls $TS_SELF/images-fs/*.img.bz2 | sort); do
bunzip2 < $img > $outimg
- #/lib/udev/vol_id $outimg | egrep -v '[[:alnum:]_]*=$' | sort > $TS_OUTPUT 2>&1
$TS_CMD_BLKID -p -o udev $outimg 2>&1 | sort > $TS_OUTPUT
ts_finalize_subtest
done