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

[SCM] Debian package checker branch, master, updated. 2.5.6-122-g79ec7e4



The following commit has been merged in the master branch:
commit 79ec7e408f8661b1fcd9635e530c415e9afc9f9d
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Apr 22 21:09:58 2012 +0200

    t/: Add test for non-dev pkg with shlib symlink
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/COVERAGE b/t/COVERAGE
index 2464717..f4e97ad 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-04-22
-Coverage: 803/964 (83.30%), w. legacy tests: 908/964 (94.19%)
+Coverage: 804/964 (83.40%), w. legacy tests: 909/964 (94.29%)
 
 The following tags are not tested by the test suite:
 
@@ -65,7 +65,6 @@ po-debconf not-using-po-debconf
 
 shared-libs ldconfig-symlink-is-not-a-symlink
 shared-libs ldconfig-symlink-referencing-wrong-file
-shared-libs non-dev-pkg-with-shlib-symlink
 shared-libs pkg-has-shlibs-control-file-but-no-actual-shared-libs
 shared-libs shlib-with-bad-permissions
 shared-libs shlib-with-executable-stack
diff --git a/t/tests/shared-libs-dev-symlink/desc b/t/tests/shared-libs-dev-symlink/desc
index dbe8b26..994b215 100644
--- a/t/tests/shared-libs-dev-symlink/desc
+++ b/t/tests/shared-libs-dev-symlink/desc
@@ -2,5 +2,5 @@ Testname: shared-libs-dev-symlink
 Sequence: 6000
 Version: 1.0-1
 Type: non-native
-Description: Test checks related to symbols files
+Description: Test checks related to dev symlink
 Test-For: dev-pkg-without-shlib-symlink
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in b/t/tests/shared-libs-non-dev-symlink/debian/debian/control.in
similarity index 96%
copy from t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
copy to t/tests/shared-libs-non-dev-symlink/debian/debian/control.in
index 817e000..b95fe1e 100644
--- a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
+++ b/t/tests/shared-libs-non-dev-symlink/debian/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: {$author}
 Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 9)
 
-Package: mylibany
+Package: libfoo1
 Architecture: any
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: {$description}
diff --git a/t/tests/shared-libs-dev-symlink/debian/debian/libfoo1.symbols b/t/tests/shared-libs-non-dev-symlink/debian/debian/libfoo1.symbols
similarity index 100%
copy from t/tests/shared-libs-dev-symlink/debian/debian/libfoo1.symbols
copy to t/tests/shared-libs-non-dev-symlink/debian/debian/libfoo1.symbols
diff --git a/t/tests/shared-libs-non-dev-symlink/desc b/t/tests/shared-libs-non-dev-symlink/desc
new file mode 100644
index 0000000..bf86930
--- /dev/null
+++ b/t/tests/shared-libs-non-dev-symlink/desc
@@ -0,0 +1,6 @@
+Testname: shared-libs-non-dev-symlink
+Sequence: 6000
+Version: 1.0-1
+Type: non-native
+Description: Test checks related to dev symlink
+Test-For: non-dev-pkg-with-shlib-symlink
diff --git a/t/tests/shared-libs-non-dev-symlink/tags b/t/tests/shared-libs-non-dev-symlink/tags
new file mode 100644
index 0000000..a3f0340
--- /dev/null
+++ b/t/tests/shared-libs-non-dev-symlink/tags
@@ -0,0 +1 @@
+W: libfoo1: non-dev-pkg-with-shlib-symlink usr/lib/libfoo.so.1.0.1 usr/lib/libfoo.so
diff --git a/t/tests/shared-libs-symbols-file/upstream/Makefile b/t/tests/shared-libs-non-dev-symlink/upstream/Makefile
similarity index 70%
copy from t/tests/shared-libs-symbols-file/upstream/Makefile
copy to t/tests/shared-libs-non-dev-symlink/upstream/Makefile
index 5ab4ec1..b62fa17 100644
--- a/t/tests/shared-libs-symbols-file/upstream/Makefile
+++ b/t/tests/shared-libs-non-dev-symlink/upstream/Makefile
@@ -1,7 +1,7 @@
 CC=gcc
 CFLAGS+= -fPIC
 
-SONAMES:= libfoo.so.1 libsym.so.1 libesym.so.1
+SONAMES:= libfoo.so.1
 LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
 
 all: $(LIBFILES)
@@ -15,8 +15,7 @@ clean:
 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 ; \
-	done
+	ln -s libfoo.so.1.0.1 $(DESTDIR)/usr/lib/libfoo.so.1
+	ln -s libfoo.so.1.0.1 $(DESTDIR)/usr/lib/libfoo.so
 
 .PHONY: install clean
diff --git a/t/tests/shared-libs-control-file/debian/code.c b/t/tests/shared-libs-non-dev-symlink/upstream/code.c
similarity index 100%
copy from t/tests/shared-libs-control-file/debian/code.c
copy to t/tests/shared-libs-non-dev-symlink/upstream/code.c

-- 
Debian package checker


Reply to: