* [PATCH 0/3] fix tests ppc
@ 2015-01-26 13:39 Ruediger Meier
2015-01-26 13:39 ` [PATCH 1/3] Revert "tests: simplify and update swaplabel test" Ruediger Meier
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Ruediger Meier @ 2015-01-26 13:39 UTC (permalink / raw)
To: util-linux
From: Ruediger Meier <ruediger.meier@ga-group.nl>
This is pull request #147 on github
https://github.com/karelzak/util-linux/pull/147
Ruediger Meier (3):
Revert "tests: simplify and update swaplabel test"
tests: fix swaplabel test for 9a83b03c
tests: fix fdisk/bsd again for big endian
tests/expected/misc/swaplabel | 4 ++--
tests/ts/fdisk/bsd | 2 +-
tests/ts/misc/swaplabel | 9 +++++++--
3 files changed, 10 insertions(+), 5 deletions(-)
--
1.8.4.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] Revert "tests: simplify and update swaplabel test"
2015-01-26 13:39 [PATCH 0/3] fix tests ppc Ruediger Meier
@ 2015-01-26 13:39 ` Ruediger Meier
2015-01-26 13:39 ` [PATCH 2/3] tests: fix swaplabel test for 9a83b03c Ruediger Meier
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Ruediger Meier @ 2015-01-26 13:39 UTC (permalink / raw)
To: util-linux
From: Ruediger Meier <ruediger.meier@ga-group.nl>
After mkswap refactoring we have still a "minimal swap size"
wich depend on PAGE_SIZE. Next commit will fix the test for
output changes made in 9a83b03c.
This reverts commit b4d27255f24cddbdf3480ca0988dada340abe2d3.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
tests/expected/misc/swaplabel | 4 ++--
tests/ts/misc/swaplabel | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel
index 17c9a6f..fd442af 100644
--- a/tests/expected/misc/swaplabel
+++ b/tests/expected/misc/swaplabel
@@ -1,6 +1,6 @@
-mkswap: error: swap area needs to be at least 40 KiB
+mkswap: error: swap area needs to be at least 10 pages
mkswap: Label was truncated.
-Setting up swapspace version 1, size = 36 KiB (36864 bytes)
+Setting up swapspace version 1, size = 9 pages
LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab
LABEL: 1234567890abcde
UUID: 12345678-abcd-abcd-abcd-1234567890ab
diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
index 45f3bb9..052ee18 100755
--- a/tests/ts/misc/swaplabel
+++ b/tests/ts/misc/swaplabel
@@ -41,14 +41,18 @@ fallocate_or_skip $(( $MIN_SWAP_SIZE - 1 )) $IMAGE
$TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
- $IMAGE >> $TS_OUTPUT 2>&1
+ $IMAGE 2>&1 |\
+ sed "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
+ >> $TS_OUTPUT 2>&1
rm -f $IMAGE
fallocate_or_skip $MIN_SWAP_SIZE $IMAGE
$TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
- $IMAGE >> $TS_OUTPUT 2>&1
+ $IMAGE 2>&1 |\
+ sed "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
+ >> $TS_OUTPUT 2>&1
$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1
#rm -f $IMAGE
--
1.8.4.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] tests: fix swaplabel test for 9a83b03c
2015-01-26 13:39 [PATCH 0/3] fix tests ppc Ruediger Meier
2015-01-26 13:39 ` [PATCH 1/3] Revert "tests: simplify and update swaplabel test" Ruediger Meier
@ 2015-01-26 13:39 ` Ruediger Meier
2015-01-26 14:16 ` Ruediger Meier
2015-01-26 13:39 ` [PATCH 3/3] tests: fix fdisk/bsd again for big endian Ruediger Meier
2015-01-28 7:43 ` [PATCH 0/3] fix tests ppc Karel Zak
3 siblings, 1 reply; 6+ messages in thread
From: Ruediger Meier @ 2015-01-26 13:39 UTC (permalink / raw)
To: util-linux
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
tests/expected/misc/swaplabel | 2 +-
tests/ts/misc/swaplabel | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel
index fd442af..623139e 100644
--- a/tests/expected/misc/swaplabel
+++ b/tests/expected/misc/swaplabel
@@ -1,6 +1,6 @@
mkswap: error: swap area needs to be at least 10 pages
mkswap: Label was truncated.
-Setting up swapspace version 1, size = 9 pages
+Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes)
LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab
LABEL: 1234567890abcde
UUID: 12345678-abcd-abcd-abcd-1234567890ab
diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
index 052ee18..8f29360 100755
--- a/tests/ts/misc/swaplabel
+++ b/tests/ts/misc/swaplabel
@@ -51,7 +51,8 @@ $TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
$IMAGE 2>&1 |\
- sed "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
+ sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
+ -e "s/($((9 * $PAGE_SIZE)) bytes)/(9xPGSZ bytes)/" \
>> $TS_OUTPUT 2>&1
$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1
--
1.8.4.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] tests: fix fdisk/bsd again for big endian
2015-01-26 13:39 [PATCH 0/3] fix tests ppc Ruediger Meier
2015-01-26 13:39 ` [PATCH 1/3] Revert "tests: simplify and update swaplabel test" Ruediger Meier
2015-01-26 13:39 ` [PATCH 2/3] tests: fix swaplabel test for 9a83b03c Ruediger Meier
@ 2015-01-26 13:39 ` Ruediger Meier
2015-01-28 7:43 ` [PATCH 0/3] fix tests ppc Karel Zak
3 siblings, 0 replies; 6+ messages in thread
From: Ruediger Meier @ 2015-01-26 13:39 UTC (permalink / raw)
To: util-linux
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Looks this line was accidentally out-commented in 06d199e8.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
tests/ts/fdisk/bsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 6b5b47a..381f228 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -131,6 +131,6 @@ echo -e "${FDISK_CMD_BSD_LIST_TYPES}" | \
$TS_CMD_FDISK ${TEST_IMAGE_NAME} | \
sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> $TS_OUTPUT 2>&1
-#fdisk_bsd_offset_and_byte_order_clean
+fdisk_bsd_offset_and_byte_order_clean
ts_fdisk_clean ${TEST_IMAGE_NAME}
ts_finalize
--
1.8.4.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] tests: fix swaplabel test for 9a83b03c
2015-01-26 13:39 ` [PATCH 2/3] tests: fix swaplabel test for 9a83b03c Ruediger Meier
@ 2015-01-26 14:16 ` Ruediger Meier
0 siblings, 0 replies; 6+ messages in thread
From: Ruediger Meier @ 2015-01-26 14:16 UTC (permalink / raw)
To: util-linux
On Monday 26 January 2015, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
>
> Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
> ---
> tests/expected/misc/swaplabel | 2 +-
> tests/ts/misc/swaplabel | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/expected/misc/swaplabel
> b/tests/expected/misc/swaplabel index fd442af..623139e 100644
> --- a/tests/expected/misc/swaplabel
> +++ b/tests/expected/misc/swaplabel
> @@ -1,6 +1,6 @@
> mkswap: error: swap area needs to be at least 10 pages
> mkswap: Label was truncated.
> -Setting up swapspace version 1, size = 9 pages
> +Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes)
> LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab
> LABEL: 1234567890abcde
> UUID: 12345678-abcd-abcd-abcd-1234567890ab
> diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
> index 052ee18..8f29360 100755
> --- a/tests/ts/misc/swaplabel
> +++ b/tests/ts/misc/swaplabel
> @@ -51,7 +51,8 @@ $TS_CMD_MKSWAP \
> --label 1234567890abcdef \
> --uuid 12345678-abcd-abcd-abcd-1234567890ab \
> $IMAGE 2>&1 |\
> - sed "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
> + sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
> + -e "s/($((9 * $PAGE_SIZE)) bytes)/(9xPGSZ bytes)/" \
... just updated this line to
+ -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE)) bytes)/(9xPGSZ bytes)/" \
(github pull request #147)
>
> >> $TS_OUTPUT 2>&1
>
> $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] fix tests ppc
2015-01-26 13:39 [PATCH 0/3] fix tests ppc Ruediger Meier
` (2 preceding siblings ...)
2015-01-26 13:39 ` [PATCH 3/3] tests: fix fdisk/bsd again for big endian Ruediger Meier
@ 2015-01-28 7:43 ` Karel Zak
3 siblings, 0 replies; 6+ messages in thread
From: Karel Zak @ 2015-01-28 7:43 UTC (permalink / raw)
To: Ruediger Meier; +Cc: util-linux
On Mon, Jan 26, 2015 at 02:39:13PM +0100, Ruediger Meier wrote:
> This is pull request #147 on github
> https://github.com/karelzak/util-linux/pull/147
Applied, thanks!
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-29 1:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-26 13:39 [PATCH 0/3] fix tests ppc Ruediger Meier
2015-01-26 13:39 ` [PATCH 1/3] Revert "tests: simplify and update swaplabel test" Ruediger Meier
2015-01-26 13:39 ` [PATCH 2/3] tests: fix swaplabel test for 9a83b03c Ruediger Meier
2015-01-26 14:16 ` Ruediger Meier
2015-01-26 13:39 ` [PATCH 3/3] tests: fix fdisk/bsd again for big endian Ruediger Meier
2015-01-28 7:43 ` [PATCH 0/3] fix tests ppc Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox