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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-21-g3b7571c



The following commit has been merged in the master branch:
commit b04e7568a3ecfc339c776879071ff6792c9ce82e
Author: Steve Langasek <steve.langasek@linaro.org>
Date:   Wed Apr 27 09:43:10 2011 +0200

    Added test case for missing-pre-dependency-on-multiarch-support
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

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

-- 
Debian package checker


Reply to: