diff options
| author | LaMont Jones <lamont@debian.org> | 2010-12-29 09:33:45 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-12-29 09:33:45 -0700 |
| commit | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (patch) | |
| tree | 840ca668a45e389792ccebaa1c414211c59ff620 /tests | |
| parent | 0d32820f872a43ef8c3021dc9b9741f2b8228b40 (diff) | |
| parent | 6c6f2af9e3949197cf7a70255895a2f4451f2319 (diff) | |
| download | util-linux-old-4f9e177060fb5ad6e574598aefdf2d5f50a8b54f.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
login-utils/Makefile.am
mount/lomount.c
text-utils/od.1
Diffstat (limited to 'tests')
73 files changed, 132 insertions, 71 deletions
diff --git a/tests/commands.sh.in b/tests/commands.sh.in index 94f6521e..2f3bd04d 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -49,5 +49,6 @@ 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/misc-utils/blkid"} +TS_CMD_PARTX=${TS_CMD_PARTX-"$TOPDIR/partx/partx"} TS_CMD_FDISK=${TS_CMD_FDISK-"$TOPDIR/fdisk/fdisk"} diff --git a/tests/expected/partx/partx-bsd b/tests/expected/partx/partx-bsd new file mode 100644 index 00000000..d4be5c59 --- /dev/null +++ b/tests/expected/partx/partx-bsd @@ -0,0 +1,2 @@ +# 1: 7936- 12799 ( 4864 sectors, 2 MB) +# 2: 12544- 16127 ( 3584 sectors, 1 MB) diff --git a/tests/expected/partx/partx-dos+bsd b/tests/expected/partx/partx-dos+bsd new file mode 100644 index 00000000..3242a6cd --- /dev/null +++ b/tests/expected/partx/partx-dos+bsd @@ -0,0 +1,4 @@ +# 1: 32- 7679 ( 7648 sectors, 3 MB) +# 2: 7680- 16383 ( 8704 sectors, 4 MB) +# 5: 7936- 12799 ( 4864 sectors, 2 MB) +# 6: 12544- 16127 ( 3584 sectors, 1 MB) diff --git a/tests/expected/partx/partx-gpt b/tests/expected/partx/partx-gpt new file mode 100644 index 00000000..0a1d491c --- /dev/null +++ b/tests/expected/partx/partx-gpt @@ -0,0 +1,5 @@ +# 1: 34- 2047 ( 2014 sectors, 1 MB) +# 2: 2048- 4095 ( 2048 sectors, 1 MB) +# 3: 4096- 6143 ( 2048 sectors, 1 MB) +# 4: 6144- 8191 ( 2048 sectors, 1 MB) +# 5: 8192- 10239 ( 2048 sectors, 1 MB) diff --git a/tests/expected/partx/partx-sgi b/tests/expected/partx/partx-sgi new file mode 100644 index 00000000..469d4422 --- /dev/null +++ b/tests/expected/partx/partx-sgi @@ -0,0 +1,2 @@ +# 1: 63- 1606499 ( 1606437 sectors, 822 MB) +# 2: 1606500- 32129999 ( 30523500 sectors, 15628 MB) diff --git a/tests/expected/partx/partx-sun b/tests/expected/partx/partx-sun new file mode 100644 index 00000000..d957f584 --- /dev/null +++ b/tests/expected/partx/partx-sun @@ -0,0 +1,2 @@ +# 1: 0- 87379 ( 87380 sectors, 44 MB) +# 2: 87380- 131069 ( 43690 sectors, 22 MB) diff --git a/tests/functions.sh b/tests/functions.sh index d79c9808..92b3ee4b 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -1,7 +1,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 @@ -344,7 +344,7 @@ function ts_swapoff { } function ts_fstab_open { - echo "# <!-- util-linux-ng test entry" >> /etc/fstab + echo "# <!-- util-linux test entry" >> /etc/fstab } function ts_fstab_close { @@ -368,13 +368,13 @@ function ts_fstab_add { function ts_fstab_clean { sed --in-place " -/# <!-- util-linux-ng/!b +/# <!-- util-linux/!b :a /# -->/!{ N ba } -s/# <!-- util-linux-ng.*-->//; +s/# <!-- util-linux.*-->//; /^$/d" /etc/fstab } diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c index 5cc6efd7..0270938b 100644 --- a/tests/helpers/test_pathnames.c +++ b/tests/helpers/test_pathnames.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007 Karel Zak <kzak@redhat.com> * - * This file is part of util-linux-ng. + * This file is part of util-linux. * * 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 diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c index 8ce1fe72..9c841dbf 100644 --- a/tests/helpers/test_sysinfo.c +++ b/tests/helpers/test_sysinfo.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007 Karel Zak <kzak@redhat.com> * - * This file is part of util-linux-ng. + * This file is part of util-linux. * * 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 diff --git a/tests/run.sh b/tests/run.sh index b99f8761..d7aa7ddc 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 @@ -35,7 +35,7 @@ if [ -n "$1" ]; then fi echo -echo "------------------ Utils-linux-ng regression tests ------------------" +echo "------------------ Utils-linux regression tests ------------------" echo echo " For development purpose only. " echo " Don't execute on production system! " diff --git a/tests/ts/bitops/swapbytes b/tests/ts/bitops/swapbytes index 0310b9dc..62e380c4 100755 --- a/tests/ts/bitops/swapbytes +++ b/tests/ts/bitops/swapbytes @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe index ff21b3b7..9dc1a178 100755 --- a/tests/ts/blkid/low-probe +++ b/tests/ts/blkid/low-probe @@ -3,7 +3,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/blkid/lowprobe-pt b/tests/ts/blkid/lowprobe-pt index 311def67..b88dd600 100755 --- a/tests/ts/blkid/lowprobe-pt +++ b/tests/ts/blkid/lowprobe-pt @@ -3,7 +3,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 3acc4a9c..2ef7bcdf 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -3,7 +3,7 @@ # # Copyright (C) 2010 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 909edd03..86ce4e21 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -3,7 +3,7 @@ # # Copyright (C) 2010 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 0539e018..75efc427 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -3,7 +3,7 @@ # # Copyright (C) 2010 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cal/1m b/tests/ts/cal/1m index 1fe64cf9..b4e4b757 100755 --- a/tests/ts/cal/1m +++ b/tests/ts/cal/1m @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cal/3m b/tests/ts/cal/3m index e8b5da5e..bf9c2222 100755 --- a/tests/ts/cal/3m +++ b/tests/ts/cal/3m @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cal/year b/tests/ts/cal/year index 658c393f..e1d4d95c 100755 --- a/tests/ts/cal/year +++ b/tests/ts/cal/year @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/col/multibyte b/tests/ts/col/multibyte index a2cf9e2f..70010290 100755 --- a/tests/ts/col/multibyte +++ b/tests/ts/col/multibyte @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness index 93ebc7c1..6a98c9e0 100755 --- a/tests/ts/cramfs/fsck-endianness +++ b/tests/ts/cramfs/fsck-endianness @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index 99b039e2..37d79c08 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness index ff5bc845..68237c0e 100755 --- a/tests/ts/cramfs/mkfs-endianness +++ b/tests/ts/cramfs/mkfs-endianness @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index 956b015d..cae34394 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index 6ffd47eb..7142a09b 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index d2c5c753..8a04d9f7 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512 index f78feba5..f60f404f 100755 --- a/tests/ts/fdisk/align-512-512 +++ b/tests/ts/fdisk/align-512-512 @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index 207ec178..4101ff4f 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/doslabel b/tests/ts/fdisk/doslabel index 209a7b3e..230778d6 100755 --- a/tests/ts/fdisk/doslabel +++ b/tests/ts/fdisk/doslabel @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/id b/tests/ts/fdisk/id index 99840a25..7e5b9495 100755 --- a/tests/ts/fdisk/id +++ b/tests/ts/fdisk/id @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput index ceb6102c..f250c91d 100755 --- a/tests/ts/fdisk/oddinput +++ b/tests/ts/fdisk/oddinput @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel index 6bf7e0ed..e1ce4f48 100755 --- a/tests/ts/fdisk/sunlabel +++ b/tests/ts/fdisk/sunlabel @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted index 6f049f7a..fae465c9 100755 --- a/tests/ts/fsck/ismounted +++ b/tests/ts/fsck/ismounted @@ -2,7 +2,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/hwclock/systohc b/tests/ts/hwclock/systohc index 413c1fe0..9dedc620 100755 --- a/tests/ts/hwclock/systohc +++ b/tests/ts/hwclock/systohc @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/ipcs/functions.sh b/tests/ts/ipcs/functions.sh index d742d8ef..24ea445e 100644 --- a/tests/ts/ipcs/functions.sh +++ b/tests/ts/ipcs/functions.sh @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers index 53bc3d1a..99b82a38 100755 --- a/tests/ts/ipcs/headers +++ b/tests/ts/ipcs/headers @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits index c4efb9cc..ed6e084c 100755 --- a/tests/ts/ipcs/limits +++ b/tests/ts/ipcs/limits @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2 index db2ca2b9..acb17491 100755 --- a/tests/ts/ipcs/limits2 +++ b/tests/ts/ipcs/limits2 @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/login/checktty b/tests/ts/login/checktty index d19fb023..9917d632 100755 --- a/tests/ts/login/checktty +++ b/tests/ts/login/checktty @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/login/islocal b/tests/ts/login/islocal index 0534f7ef..ba238573 100755 --- a/tests/ts/login/islocal +++ b/tests/ts/login/islocal @@ -3,7 +3,7 @@ # # Copyright (C) 2008 James Youngman <jay@gnu.org> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/look/separator b/tests/ts/look/separator index 53cf9c7e..17d68db6 100755 --- a/tests/ts/look/separator +++ b/tests/ts/look/separator @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu index a3c6e492..a7d7a952 100755 --- a/tests/ts/lscpu/lscpu +++ b/tests/ts/lscpu/lscpu @@ -2,7 +2,7 @@ # # Copyright (C) 2008 Cai Qian <qcai@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/md5/md5 b/tests/ts/md5/md5 index eda6d049..e94fb636 100755 --- a/tests/ts/md5/md5 +++ b/tests/ts/md5/md5 @@ -3,7 +3,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck index 33518fc6..f9680386 100755 --- a/tests/ts/minix/fsck +++ b/tests/ts/minix/fsck @@ -2,7 +2,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs index 72770ba1..e74a169a 100755 --- a/tests/ts/minix/mkfs +++ b/tests/ts/minix/mkfs @@ -2,7 +2,7 @@ # # Copyright (C) 2009 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/misc/strtosize b/tests/ts/misc/strtosize index 41b45492..c1ed2448 100755 --- a/tests/ts/misc/strtosize +++ b/tests/ts/misc/strtosize @@ -3,7 +3,7 @@ # # Copyright (C) 2010 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 64b79036..0448a4b3 100755 --- a/tests/ts/mount/devname +++ b/tests/ts/mount/devname @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname index 1a2494de..04fda9d0 100755 --- a/tests/ts/mount/fstab-devname +++ b/tests/ts/mount/fstab-devname @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label index 053213f2..25db73f1 100755 --- a/tests/ts/mount/fstab-devname2label +++ b/tests/ts/mount/fstab-devname2label @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid index 5cab621e..373e1759 100755 --- a/tests/ts/mount/fstab-devname2uuid +++ b/tests/ts/mount/fstab-devname2uuid @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label index 21903830..88331f4a 100755 --- a/tests/ts/mount/fstab-label +++ b/tests/ts/mount/fstab-label @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname index 6ae9bffb..88ae7482 100755 --- a/tests/ts/mount/fstab-label2devname +++ b/tests/ts/mount/fstab-label2devname @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid index f74cdf29..c643e618 100755 --- a/tests/ts/mount/fstab-label2uuid +++ b/tests/ts/mount/fstab-label2uuid @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index 41e51b4a..0c1c68d7 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index 73b59dcc..7032c291 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname index a013d2eb..99d00b8c 100755 --- a/tests/ts/mount/fstab-uuid2devname +++ b/tests/ts/mount/fstab-uuid2devname @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label index 94fb5176..e510fc1b 100755 --- a/tests/ts/mount/fstab-uuid2label +++ b/tests/ts/mount/fstab-uuid2label @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/label b/tests/ts/mount/label index c880e4b3..92b1c13a 100755 --- a/tests/ts/mount/label +++ b/tests/ts/mount/label @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/move b/tests/ts/mount/move index 660ef436..bc4941d0 100755 --- a/tests/ts/mount/move +++ b/tests/ts/mount/move @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/mtablock b/tests/ts/mount/mtablock index 137e1a2a..068b67c1 100755 --- a/tests/ts/mount/mtablock +++ b/tests/ts/mount/mtablock @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical index 31149923..528861ab 100755 --- a/tests/ts/mount/noncanonical +++ b/tests/ts/mount/noncanonical @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths index bb2cabf3..f2f09d4d 100755 --- a/tests/ts/mount/paths +++ b/tests/ts/mount/paths @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount index 57dd074c..d303703b 100755 --- a/tests/ts/mount/remount +++ b/tests/ts/mount/remount @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/mount/special b/tests/ts/mount/special index f31154ec..76b07964 100755 --- a/tests/ts/mount/special +++ b/tests/ts/mount/special @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 @@ -25,7 +25,7 @@ ts_skip_nonroot cat > $MOUNTER <<\EOF #!/bin/bash -# This util-linux-ng regression test component +# This util-linux regression test component # It's safe to remove me... # echo "$0 called with \"$*\"" diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid index 79842306..3a47d50d 100755 --- a/tests/ts/mount/uuid +++ b/tests/ts/mount/uuid @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/namei/logic b/tests/ts/namei/logic index f396712e..eda5d1b0 100755 --- a/tests/ts/namei/logic +++ b/tests/ts/namei/logic @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx new file mode 100755 index 00000000..5b3b450c --- /dev/null +++ b/tests/ts/partx/partx @@ -0,0 +1,45 @@ +#!/bin/bash + +# +# Copyright (C) 2010 Davidlohr Bueso <dave@gnu.org> +# +# 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="partitions probing" +TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt" + +. $TS_TOPDIR/functions.sh + +ts_init "$*" + +if [ ! -x "$TS_CMD_PARTX" ]; then + ts_skip "partx disabled" +fi + +mkdir -p $TS_OUTDIR/images-pt + +for img in $(ls $TS_IMGDIR/*.img.bz2 | sort); do + name=$(basename $img .img.bz2) + outimg=$TS_OUTDIR/images-pt/${name}.img + + ts_init_subtest $name + + bunzip2 < $img > $outimg + + $TS_CMD_PARTX $outimg &> $TS_OUTPUT + ts_finalize_subtest +done + +ts_finalize diff --git a/tests/ts/paths/built-in b/tests/ts/paths/built-in index c540b2f4..84ee5553 100755 --- a/tests/ts/paths/built-in +++ b/tests/ts/paths/built-in @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/schedutils/cpuset b/tests/ts/schedutils/cpuset index 6ad240dc..f3f11ddb 100755 --- a/tests/ts/schedutils/cpuset +++ b/tests/ts/schedutils/cpuset @@ -1,7 +1,7 @@ #!/bin/bash # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/script/race b/tests/ts/script/race index 4962db96..e4822644 100755 --- a/tests/ts/script/race +++ b/tests/ts/script/race @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname index 6ad6b2fc..e2ac048f 100755 --- a/tests/ts/swapon/devname +++ b/tests/ts/swapon/devname @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label index ec0de66f..0cb650a8 100755 --- a/tests/ts/swapon/label +++ b/tests/ts/swapon/label @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid index 3c015d9e..bbcafa20 100755 --- a/tests/ts/swapon/uuid +++ b/tests/ts/swapon/uuid @@ -3,7 +3,7 @@ # # Copyright (C) 2007 Karel Zak <kzak@redhat.com> # -# This file is part of util-linux-ng. +# This file is part of util-linux. # # 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 |