[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#568680: lintian: binaries-multiarch test fails on amd64



Package: lintian
Version: 2.3.3
Severity: normal
Tags: patch

The binaries-multiarch test appends host architecture specific information
to the 'triplet-dir-and-architecture-mismatch' tag, causing a test
suite failure when on (at least) amd64.

Running test binaries-multiarch 1.0... building... testing... FAILED:
--- t/tests/binaries-multiarch/tags 2010-01-31 11:02:32.000000000 +0200
+++ debian/tests/tags.binaries-multiarch    2010-02-06 22:20:10.000000000 +0200
@@ -1 +1 @@
-E: binaries-multiarch: triplet-dir-and-architecture-mismatch usr/lib/x86_64-linux-gnu/ is for amd64
+E: binaries-multiarch: triplet-dir-and-architecture-mismatch usr/lib/i486-linux-gnu/ is for i386

Patch attached, this works for me on both i386 and amd64.
-- 
Niko Tyni   ntyni@debian.org
>From 5beef7fb3268ba2df2c6c028686935cb614c3989 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sat, 6 Feb 2010 22:43:15 +0200
Subject: [PATCH] Fix binaries-multiarch test failure on !i386

The binaries-multiarch test output depends on the host architecture:
on i386 it will warn about installing to an amd64 path, while
on others the warning is about an i386 path.

Post process the output accordingly.
---
 t/tests/binaries-multiarch/post_test |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
 create mode 100644 t/tests/binaries-multiarch/post_test

diff --git a/t/tests/binaries-multiarch/post_test b/t/tests/binaries-multiarch/post_test
new file mode 100644
index 0000000..bef12aa
--- /dev/null
+++ b/t/tests/binaries-multiarch/post_test
@@ -0,0 +1,2 @@
+s/i486-linux-gnu/x86_64-linux-gnu/
+s/is for i386/is for amd64/
-- 
1.6.6.1


Reply to: