← Back to branch summary

~csurbhi/ubuntu/maverick/e2fsprogs/e2fsprogs.fix-505719

« back to all changes in this revision

Viewing changes to lib/blkid/test_probe.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2008-08-08 20:32:11 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080808203211-w72lpsd9q7o3bw6x
Tags: 1.41.0-3ubuntu1
https://launchpad.net/bugs/254152
https://launchpad.net/bugs/246461
* Merge from Debian unstable (LP: #254152, #246461), remaining changes:
  - Do not build-depend on dietlibc-dev, which is in universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/blkid/test_probe.in
8
8
        done
9
9
fi
10
10
 
11
 
mkdir -p tests
 
11
mkdir -p tests/tmp
12
12
 
13
13
for i in $TESTS
14
14
do
15
15
        printf "%s: " $i
16
 
        if test ! -f $SRCDIR/tests/$i.img.bz2 -a \
17
 
                ! -f $SRCDIR/tests/$i.results ; 
 
16
        RESULTS=$SRCDIR/tests/$i.results
 
17
        IMAGE_BZ2=$SRCDIR/tests/$i.img.bz2
 
18
        IMAGE=tests/tmp/$i.img.$$
 
19
        if test ! -f $IMAGE_BZ2 -a ! -f $RESULTS ;
18
20
        then
19
21
                echo "non-existent"
20
22
                continue
21
23
        fi
22
 
        bunzip2 < $SRCDIR/tests/$i.img.bz2 > /tmp/test.img.$$
23
 
        ./tst_probe /tmp/test.img.$$ > tests/$i.out
24
 
        /bin/rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed
25
 
        cmp -s tests/$i.out $SRCDIR/tests/$i.results
 
24
        if [ "$i" = "swap0" ]; then
 
25
                # swap is native-endian, so regenerate before testing
 
26
                dd if=/dev/zero of=$IMAGE bs=16k count=64 2> /dev/null
 
27
                mkswap -v0 $IMAGE > /dev/null
 
28
        elif [ "$i" = "swap1" ]; then
 
29
                # swap is native-endian, so regenerate before testing
 
30
                dd if=/dev/zero of=$IMAGE bs=16k count=64 2> /dev/null
 
31
                # check if mkswap supports the "-U" option
 
32
                if mkswap -h 2>&1 | grep -q -- '-U'; then
 
33
                        UUID="-U 8ff8e77f-8553-485e-8656-58be67a81666"
 
34
                else
 
35
                        RMUUID="| grep -v UUID"
 
36
                        RES_TMP=$SRCDIR/tests/tmp/$i.results
 
37
                        grep -v UUID $RESULTS > $RES_TMP
 
38
                        RESULTS=$RES_TMP
 
39
                fi
 
40
                mkswap -v1 -L SWAP-TEST $UUID $IMAGE >/dev/null
 
41
        else
 
42
                bunzip2 < $IMAGE_BZ2 > $IMAGE
 
43
        fi
 
44
        eval ./tst_probe $IMAGE $RMUUID > tests/$i.out
 
45
        /bin/rm -f $IMAGE tests/$i.ok tests/$i.failed
 
46
        cmp -s tests/$i.out $RESULTS
 
47
        unset RMUUID
26
48
        if [ $? = 0 ];  then
27
49
                echo ok
28
50
                touch tests/$i.ok
29
51
        else    
30
52
                echo failed
31
 
                diff -c tests/$i.out $SRCDIR/tests/$i.results > tests/$i.failed
 
53
                diff -c tests/$i.out $RESULTS > tests/$i.failed
32
54
        fi
33
55
done
34
56