[lintian] 01/02: t: Fix incorrect test
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 49d356eb8d5c9cfdb206ae43926ae61c33c5445e
Author: Niels Thykier <niels@thykier.net>
Date: Thu Apr 20 16:38:40 2017 +0000
t: Fix incorrect test
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/files.pm | 2 +-
t/tests/files-wrong-ma-foreign/debian/Makefile | 10 ++++++----
t/tests/files-wrong-ma-foreign/debian/debian/control.in | 16 +++++++++++++++-
.../debian/debian/libpublic-dev.install | 1 +
.../debian/debian/libpublic1.install | 1 +
t/tests/files-wrong-ma-foreign/desc | 2 +-
t/tests/files-wrong-ma-foreign/tags | 2 +-
7 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/checks/files.pm b/checks/files.pm
index 3b28d45..c203579 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -1100,7 +1100,7 @@ sub run {
}
}
- if ($fname =~ m,(?:usr/)?lib/(?:([^/]+)/)?lib[^/]*\.so$,) {
+ if ($fname =~ m,^(?:usr/)?lib/(?:([^/]+)/)?lib[^/]*\.so$,) {
$has_public_shared_library = 1
if (!defined($1) || $TRIPLETS->known($1));
}
diff --git a/t/tests/files-wrong-ma-foreign/debian/Makefile b/t/tests/files-wrong-ma-foreign/debian/Makefile
index 64f6bba..ff58c3a 100644
--- a/t/tests/files-wrong-ma-foreign/debian/Makefile
+++ b/t/tests/files-wrong-ma-foreign/debian/Makefile
@@ -3,6 +3,7 @@ CFLAGS+= -fPIC
SONAMES:= libpublic.so.1
LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
+LIBDIR := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
all: $(LIBFILES)
@@ -13,10 +14,11 @@ clean:
rm -f *.a *.o *.so*
install: all
- install -m 0755 -d $(DESTDIR)/usr/lib
- install -m 0644 *.so* $(DESTDIR)/usr/lib
- for FILE in $(SONAMES) ; do \
- ln -s $${FILE}.0.1 $(DESTDIR)/usr/lib/$$FILE ; \
+ install -m 0755 -d $(DESTDIR)$(LIBDIR)
+ install -m 0644 *.so* $(DESTDIR)$(LIBDIR)
+ set -e ; for FILE in $(SONAMES) ; do \
+ ln -s $${FILE}.0.1 $(DESTDIR)$(LIBDIR)/$$FILE ; \
+ ln -s $${FILE}.0.1 $(DESTDIR)$(LIBDIR)/$$(echo $$FILE | perl -pe 's/\.so\K.*//') ; \
done
.PHONY: install clean
diff --git a/t/tests/files-wrong-ma-foreign/debian/debian/control.in b/t/tests/files-wrong-ma-foreign/debian/debian/control.in
index 8ef50d3..5daf9a2 100644
--- a/t/tests/files-wrong-ma-foreign/debian/debian/control.in
+++ b/t/tests/files-wrong-ma-foreign/debian/debian/control.in
@@ -8,10 +8,24 @@ Build-Depends: {$build_depends}
Package: libpublic1
Architecture: any
Depends: $\{misc:Depends\}, $\{shlibs:Depends\},
-Multi-Arch: foreign
+Multi-Arch: same
Description: {$description}
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package. It may
be an empty package.
+Package: libpublic-dev
+Section: libdevel
+Architecture: any
+Depends: $\{misc:Depends\}, $\{shlibs:Depends\},
+Multi-Arch: foreign
+Description: {$description} (dev)
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+ .
+ Supposedly includes some headers.
+
+
diff --git a/t/tests/files-wrong-ma-foreign/debian/debian/libpublic-dev.install b/t/tests/files-wrong-ma-foreign/debian/debian/libpublic-dev.install
new file mode 100644
index 0000000..012244d
--- /dev/null
+++ b/t/tests/files-wrong-ma-foreign/debian/debian/libpublic-dev.install
@@ -0,0 +1 @@
+usr/lib/*/*.so
diff --git a/t/tests/files-wrong-ma-foreign/debian/debian/libpublic1.install b/t/tests/files-wrong-ma-foreign/debian/debian/libpublic1.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/t/tests/files-wrong-ma-foreign/debian/debian/libpublic1.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/t/tests/files-wrong-ma-foreign/desc b/t/tests/files-wrong-ma-foreign/desc
index f1beafe..c3d970b 100644
--- a/t/tests/files-wrong-ma-foreign/desc
+++ b/t/tests/files-wrong-ma-foreign/desc
@@ -2,4 +2,4 @@ Testname: files-wrong-ma-foreign
Version: 1.0
Description: Test for wrong usage of Multi-Arch foreign
Test-Depends: debhelper (>= 9.20151004~)
-Test-for: shlib-in-multi-arch-foreign-package
+Test-for: multiarch-foreign-shared-library
diff --git a/t/tests/files-wrong-ma-foreign/tags b/t/tests/files-wrong-ma-foreign/tags
index f67dd7f..e4d74ce 100644
--- a/t/tests/files-wrong-ma-foreign/tags
+++ b/t/tests/files-wrong-ma-foreign/tags
@@ -1 +1 @@
-E: libpublic1: shlib-in-multi-arch-foreign-package usr/lib/libpublic.so.1.0.1
+W: libpublic-dev: multiarch-foreign-shared-library
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: