diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/commands.sh.in | 4 | ||||
| -rw-r--r-- | tests/expected/fdisk/doslabel | 18 | ||||
| -rw-r--r-- | tests/expected/paths/built-in | 3 | ||||
| -rw-r--r-- | tests/functions.sh | 20 | ||||
| -rw-r--r-- | tests/helpers/test_pathnames.c | 3 | ||||
| -rwxr-xr-x | tests/ts/fdisk/doslabel | 82 |
6 files changed, 121 insertions, 9 deletions
diff --git a/tests/commands.sh.in b/tests/commands.sh.in index 232ae630..f9eeec14 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -45,6 +45,6 @@ TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$TOPDIR/login-utils/islocal_test"} TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$TOPDIR/hwclock/hwclock"} TS_CMD_LSCPU=${TS_CMD_LSCPU-"$TOPDIR/sys-utils/lscpu"} -TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/libs/blkid/bin/blkid"} - +TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/misc-utils/blkid"} +TS_CMD_FDISK=${TS_CMD_FDISK-"$TOPDIR/fdisk/fdisk"} diff --git a/tests/expected/fdisk/doslabel b/tests/expected/fdisk/doslabel new file mode 100644 index 00000000..1d987f6d --- /dev/null +++ b/tests/expected/fdisk/doslabel @@ -0,0 +1,18 @@ +Initialize empty image +f1c9645dbc14efddc7d8a322685f26eb doslabel.img +Create new DOS partition table +57e721e38d1266c2df055067c18f2cf9 doslabel.img +Create primary partition +ae4f9b12f4a768849f72ea36938c30c7 doslabel.img +Create extended partition +76987a00b353687cd1dba3ddea9d66f9 doslabel.img +Create logical partitions +a1cd6708e4a6d2e5f6bc9d5c0da0cf3b doslabel.img +Delete logical partitions +4c6937d529ace5661fb82efb9394154a doslabel.img +Create another logical partition +9589eaaed698d2402945ab3e513c1eb4 doslabel.img +Delete primary partition +1e6d646e5df66a2664cfbbb13fa9a08a doslabel.img +Delete extended partition +fc3cdb12326656d7996b09b6f76973e7 doslabel.img diff --git a/tests/expected/paths/built-in b/tests/expected/paths/built-in index 318f44e5..51372de3 100644 --- a/tests/expected/paths/built-in +++ b/tests/expected/paths/built-in @@ -1,6 +1,7 @@ _PATH_DEFPATH /usr/local/bin:/bin:/usr/bin _PATH_DEFPATH_ROOT /usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - _PATH_TTY /dev/tty + _PATH_DEV_TTY /dev/tty + _PATH_DEV_LOOP /dev/loop _PATH_SECURETTY /etc/securetty _PATH_WTMPLOCK /etc/wtmplock _PATH_HUSHLOGIN .hushlogin diff --git a/tests/functions.sh b/tests/functions.sh index d07b7e31..50ef12d8 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -246,13 +246,23 @@ function ts_die { ts_finalize } -function ts_device_init { - local img="$TS_OUTDIR/${TS_TESTNAME}.img" - local dev="" +function ts_image_md5sum { + local img=${1:-"$TS_OUTDIR/${TS_TESTNAME}.img"} + echo $(md5sum "$img" | awk '{printf $1}') $(basename "$img") +} - dd if=/dev/zero of="$img" bs=1M count=5 &> /dev/null +function ts_image_init { + local mib=${1:-"5"} # size in MiBs + local img=${2:-"$TS_OUTDIR/${TS_TESTNAME}.img"} + + dd if=/dev/zero of="$img" bs=1M count=$mib &> /dev/null + echo "$img" + return 0 +} - dev=$($TS_CMD_LOSETUP -s -f "$img") +function ts_device_init { + local img=$(ts_image_init) + local dev=$($TS_CMD_LOSETUP -s -f "$img") if [ -z "$dev" ]; then ts_device_deinit $dev diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c index 1accedec..5cc6efd7 100644 --- a/tests/helpers/test_pathnames.c +++ b/tests/helpers/test_pathnames.c @@ -33,7 +33,8 @@ struct hlpPath paths[] = { DEF_HLPPATH(_PATH_DEFPATH), DEF_HLPPATH(_PATH_DEFPATH_ROOT), - DEF_HLPPATH(_PATH_TTY), + DEF_HLPPATH(_PATH_DEV_TTY), + DEF_HLPPATH(_PATH_DEV_LOOP), DEF_HLPPATH(_PATH_SECURETTY), DEF_HLPPATH(_PATH_WTMPLOCK), DEF_HLPPATH(_PATH_HUSHLOGIN), diff --git a/tests/ts/fdisk/doslabel b/tests/ts/fdisk/doslabel new file mode 100755 index 00000000..a7ea576d --- /dev/null +++ b/tests/ts/fdisk/doslabel @@ -0,0 +1,82 @@ +#!/bin/bash + +# +# This file is part of util-linux-ng. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +TS_TOPDIR="$(dirname $0)/../.." +TS_DESC="doslabel tests" + +. $TS_TOPDIR/functions.sh +ts_init "$*" + +# cmd to change number of cylinders to 1024 and changes system id to 0x1 +FDISK_CMD_INIT='x\nc\n1024\ni\n0x1\nr\n' +FDISK_CMD_WRITE_CLOSE='w\nq\n' +FDISK_CMD_CREATE_DOSLABEL='o\n' #create dos label +FDISK_CMD_CREATE_PRIMARY='n\np\n1\n\n+1M\n' # create primary partition 1 of size 1MB +FDISK_CMD_CREATE_EXTENDED='n\ne\n2\n\n+10\n' # create extended partition 2 of size 11 cylinders +FDISK_CMD_CREATE_LOGICAL='n\nl\n\n+1\n' # create next logical partition of size 2 cyl +FDISK_CMD_DELETE_LOGICALS='d\n6\nd\n5\nd\n6\d5\n' # delete middle, head, tail, last partitions +FDISK_CMD_DELETE_PRIMARY='d\n1\n' # delete first primary +FDISK_CMD_DELETE_EXTENDED='d\n2\n' # delete second primary + +#set -x + +ts_log "Initialize empty image" +TEST_IMAGE_NAME=$(ts_image_init 10) +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +# need to run init twice, to change system ID after new label, otherwise system +# ID will be random and will screw up md5's +ts_log "Create new DOS partition table" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Create primary partition" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ + $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Create extended partition" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \ + $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Create logical partitions" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Delete logical partitions" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Create another logical partition" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Delete primary partition" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_log "Delete extended partition" +echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \ + | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null +ts_image_md5sum 2>&1 >> $TS_OUTPUT + +ts_finalize |