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

Re: Status on Lintian 2.5.0~rc3



On Wed, Apr 20, 2011 at 05:47:35PM +0200, Niels Thykier wrote:

> Yay, committed - I will hit the release button tomorrow [1] unless
> anyone has any comments/objections to the patches.
>   Steve, have you communicated the request to make
> missing-pre-dependency-on-multiarch-support an auto-reject to the FTP
> masters?

Well, I have now! :)

And as a bonus, attached is a patch to add a test suite check for the new
tag.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek@ubuntu.com                                     vorlon@debian.org
>From 92dc58bb05779d61120f0aea1d6ca18dc773d189 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@linaro.org>
Date: Fri, 22 Apr 2011 00:31:31 -0700
Subject: [PATCH] extend multiarch test to check for missing-pre-dependency-on-multiarch-support

---
 t/tests/binaries-multiarch/debian/Makefile |    8 ++++----
 t/tests/binaries-multiarch/debian/basic.c  |    2 +-
 t/tests/binaries-multiarch/desc            |    4 +++-
 t/tests/binaries-multiarch/tags            |    2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/t/tests/binaries-multiarch/debian/Makefile b/t/tests/binaries-multiarch/debian/Makefile
index 46e8fd1..0b95b0e 100644
--- a/t/tests/binaries-multiarch/debian/Makefile
+++ b/t/tests/binaries-multiarch/debian/Makefile
@@ -15,17 +15,17 @@ endif
 
 
 all:
-	gcc -o basic basic.c
+	gcc -fPIC -shared -Wl,-z,defs -Wl,-soname,libbasic.so.2 -o libbasic.so.2 basic.c
 
 install:
 	# install it once under the correct triplet directory
 	install -d $(DESTDIR)/usr/lib/$(TRIPLETT)
-	install -m 755 -c basic $(DESTDIR)/usr/lib/$(TRIPLETT)/basic
+	install -m 644 -c -s libbasic.so.2 $(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
 	# and one more time under the wrong triplet directory
 	install -d $(DESTDIR)/usr/lib/$(WRONG_TRIPLETT)
-	install -m 755 -c basic $(DESTDIR)/usr/lib/$(WRONG_TRIPLETT)/basic
+	install -m 644 -c -s libbasic.so.2 $(DESTDIR)/usr/lib/$(WRONG_TRIPLETT)/libbasic.so.2
 
 clean distclean:
-	rm -f basic
+	rm -f libbasic.so.2
 
 check test:
diff --git a/t/tests/binaries-multiarch/debian/basic.c b/t/tests/binaries-multiarch/debian/basic.c
index 00f3787..a03a790 100644
--- a/t/tests/binaries-multiarch/debian/basic.c
+++ b/t/tests/binaries-multiarch/debian/basic.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 int
-main(void)
+lib_interface(void)
 {
     printf("Hello world!\n");
 }
diff --git a/t/tests/binaries-multiarch/desc b/t/tests/binaries-multiarch/desc
index ac6dfae..8074827 100644
--- a/t/tests/binaries-multiarch/desc
+++ b/t/tests/binaries-multiarch/desc
@@ -3,4 +3,6 @@ Sequence: 6000
 Version: 1.0
 Description: Multiarch-related tests but not multiarch itself
 Architecture: i386 amd64
-Test-For: triplet-dir-and-architecture-mismatch
+Test-For:
+ triplet-dir-and-architecture-mismatch
+ missing-pre-dependency-on-multiarch-support
diff --git a/t/tests/binaries-multiarch/tags b/t/tests/binaries-multiarch/tags
index a2c835a..c9803c7 100644
--- a/t/tests/binaries-multiarch/tags
+++ b/t/tests/binaries-multiarch/tags
@@ -1 +1,3 @@
+E: binaries-multiarch: missing-pre-dependency-on-multiarch-support
 E: binaries-multiarch: triplet-dir-and-architecture-mismatch usr/lib/x86_64-linux-gnu/ is for amd64
+I: binaries-multiarch: no-symbols-control-file usr/lib/x86_64-linux-gnu/libbasic.so.2
-- 
1.7.4.1


Reply to: