Commit f67a21e7 authored by Cyril Brulebois's avatar Cyril Brulebois
Browse files

Fix test_db testsuite to be LC_COLLATE-independent.

Call sort -u on both the $expected and $fields variables. Closes: #711759
(cherry picked from commit 3fa454d0

)

Conflicts:
	debian/changelog
	test_db
Signed-off-by: default avatarCyril Brulebois <kibi@debian.org>
parent 1bbae266
flash-kernel (3.3+deb7u2) wheezy; urgency=low
* Fix test_db testsuite to be LC_COLLATE-independent, by calling sort -u
on both the $expected and $fields variables. Closes: #711759
-- Cyril Brulebois <kibi@debian.org> Wed, 12 Jun 2013 01:41:30 +0200
flash-kernel (3.3+deb7u1) wheezy; urgency=low
[ Cyril Brulebois ]
......
......@@ -24,7 +24,9 @@ flash_kernel="${FK_CHECKOUT:-$FK_DIR}/flash-kernel"
test_no_unknown_fields() {
local expected='Android-Boot-Device Boot-Device Boot-DTB-Path Boot-Initrd-Path Boot-Kernel-Path Bootloader-sets-root Boot-Multi-Path Boot-Script-Path DTB-Append DTB-Id Kernel-Flavors Machine Machine-Id Method Mtd-Initrd Mtd-Kernel Optional-Packages Required-Packages U-Boot-Initrd-Address U-Boot-Kernel-Address U-Boot-Multi-Address U-Boot-Script-Address U-Boot-Script-Name'
expected="$(echo "$expected" | sed 's/ /\n/g' | sort -u | xargs)"
local fields="$(echo "$MACHINE_DB" | sed -n '/^[^#]*:/s/:.*//p' | sort -u | xargs)"
echo $fields
if [ "$fields" != "$expected" ]; then
return 1
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment