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

[SCM] Debian package checker branch, master, updated. 2.5.14-68-gc3f74e4



The following commit has been merged in the master branch:
commit 8e8e7df3f3c3cce0c25ad4addd913bb084950968
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Tue Jul 16 21:20:36 2013 +0200

    Test for unstripped-binary-or-object
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/tests/binaries-general/debian/Makefile b/t/tests/binaries-general/debian/Makefile
index c6271ac..40ea1d0 100644
--- a/t/tests/binaries-general/debian/Makefile
+++ b/t/tests/binaries-general/debian/Makefile
@@ -16,12 +16,15 @@ all:
 	$(COMPILE) -o basicdebug -g3 -Wl,--build-id basic.c
 
 install:
+	# according to local debian rules /usr/lib/debug is unstripped
 	install -d $(DESTDIR)/usr/share/foo/
-	install -m 755 -c basic $(DESTDIR)/usr/share/foo/basic
 	install -d $(DESTDIR)/usr/lib/debug/usr/share/foo/
+	install -d $(DESTDIR)/usr/lib/foo/
+	install -d $(DESTDIR)/usr/bin
+
+	install -m 755 -c basic $(DESTDIR)/usr/share/foo/basic
 	objcopy --only-keep-debug basic $(DESTDIR)/usr/lib/debug/usr/share/foo/basic
 	strip -s $(DESTDIR)/usr/lib/debug/usr/share/foo/basic
-	install -d $(DESTDIR)/usr/lib/foo/
 	install -m 755 -c basiclibrpath $(DESTDIR)/usr/lib/foo/basiclibrpath
 	install -m 755 -c basicshippedrpath $(DESTDIR)/usr/lib/foo/basicshippedrpath
 	objcopy --only-keep-debug basic $(DESTDIR)/usr/lib/debug/basic
@@ -34,9 +37,9 @@ install:
 	install -d "$(DESTDIR)/usr/lib/debug/.build-id/"`$(GETBUILDID) -s basicdebug`
 	objcopy --compress-debug-sections --only-keep-debug basicdebug \
 		"$(DESTDIR)/usr/lib/debug/.build-id/"`$(GETBUILDID) -s basicdebug`"/"`$(GETBUILDID) -f basicdebug`.debug
-	cp basic.static $(DESTDIR)/usr/lib/debug/
-	# dh_strip attempts to play the smart guy if the ELF obj is executable.
-	cd $(DESTDIR)/usr/lib/debug/ && chmod -x basic basic.static
+	install -m 755 -c basic.static $(DESTDIR)/usr/lib/debug/
+	# according to local debian rules unstripped in name avoid dh_strip to do the work
+	install -m 755 basicdebug $(DESTDIR)/usr/bin/unstripped
 
 clean distclean:
 	rm -f basic
diff --git a/t/tests/binaries-general/debian/debian/rules b/t/tests/binaries-general/debian/debian/rules
index c60cf8b..37608c2 100644
--- a/t/tests/binaries-general/debian/debian/rules
+++ b/t/tests/binaries-general/debian/debian/rules
@@ -4,4 +4,4 @@
 	dh $@
 
 override_dh_strip:
-	dh_strip -X usr/lib/debug
+	dh_strip -X usr/lib/debug -X unstripped
diff --git a/t/tests/binaries-general/desc b/t/tests/binaries-general/desc
index 8b2d05e..d870021 100644
--- a/t/tests/binaries-general/desc
+++ b/t/tests/binaries-general/desc
@@ -11,3 +11,4 @@ Test-For:
  debug-file-should-use-detached-symbols
  debug-file-with-no-debug-symbols
  library-in-debug-or-profile-should-not-be-stripped
+ unstripped-binary-or-object
diff --git a/t/tests/binaries-general/tags b/t/tests/binaries-general/tags
index d3481fa..ab2e298 100644
--- a/t/tests/binaries-general/tags
+++ b/t/tests/binaries-general/tags
@@ -4,7 +4,9 @@ E: binaries-general: binary-or-shlib-defines-rpath usr/lib/foo/basiclibrpath /us
 E: binaries-general: binary-or-shlib-defines-rpath usr/share/foo/basic /usr/local/lib
 E: binaries-general: debug-symbols-directly-in-usr-lib-debug usr/lib/debug/basic
 E: binaries-general: library-in-debug-or-profile-should-not-be-stripped usr/lib/debug/usr/share/foo/basic
+E: binaries-general: unstripped-binary-or-object usr/bin/unstripped
 W: binaries-general: binary-compiled-with-profiling-enabled usr/share/foo/basic
+W: binaries-general: binary-without-manpage usr/bin/unstripped
 W: binaries-general: debug-file-should-use-detached-symbols usr/lib/debug/.build-id/de/deadbeefdeadbeef.debug
 W: binaries-general: debug-file-with-no-debug-symbols usr/lib/debug/usr/share/foo/basic
 W: binaries-general: debug-package-should-be-named-dbg usr/lib/debug/.build-id/

-- 
Debian package checker


Reply to: