[SCM] Debian package checker branch, master, updated. 2.2.6-3-g5fa2f2e
The following commit has been merged in the master branch:
commit ba0aa594881055f6d229e6f45f9601846f6d7c3d
Author: Russ Allbery <rra@debian.org>
Date: Sun Feb 22 13:23:49 2009 -0800
Use a less artificial test for embedded-zlib
diff --git a/t/tests/binaries-embedded-zlib/debian/Makefile b/t/tests/binaries-embedded-zlib/debian/Makefile
new file mode 100644
index 0000000..8fb317e
--- /dev/null
+++ b/t/tests/binaries-embedded-zlib/debian/Makefile
@@ -0,0 +1,11 @@
+all:
+ gcc -o dummy dummy.c
+
+install:
+ install -d $(DESTDIR)/usr/bin
+ install -m 755 -c dummy $(DESTDIR)/usr/bin/dummy
+
+clean distclean:
+ rm -f dummy
+
+check test:
diff --git a/t/tests/binaries-embedded-zlib/debian/debian/install b/t/tests/binaries-embedded-zlib/debian/debian/install
deleted file mode 100644
index fdaf3a4..0000000
--- a/t/tests/binaries-embedded-zlib/debian/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/elfobject usr/bin/
diff --git a/t/tests/binaries-embedded-zlib/debian/debian/rules b/t/tests/binaries-embedded-zlib/debian/debian/rules
deleted file mode 100755
index 4ae2893..0000000
--- a/t/tests/binaries-embedded-zlib/debian/debian/rules
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_BUILD_OPTIONS := nostrip
-export DEB_BUILD_OPTIONS
-
-%:
- dh $@
-
-binary:
- head -n1 /bin/true > debian/elfobject
- echo "deflate 1.2.3.3 Copyright 1995-2006 Jean-loup Gailly" \
- >> debian/elfobject
- dh binary
diff --git a/t/tests/binaries-embedded-zlib/debian/dummy.c b/t/tests/binaries-embedded-zlib/debian/dummy.c
new file mode 100644
index 0000000..3237ebd
--- /dev/null
+++ b/t/tests/binaries-embedded-zlib/debian/dummy.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+
+/*
+ * zlib asks derivative works to include this string, so it's the signature
+ * that we use to detect embedded copies.
+ */
+static const char deflate_copyright[]
+ = "deflate 1.2.3.3 Copyright 1995-2006 Jean-loup Gailly";
+
+int
+main(void)
+{
+ printf("%s\n", deflate_copyright);
+}
diff --git a/t/tests/binaries-embedded-zlib/desc b/t/tests/binaries-embedded-zlib/desc
index 9066a3f..837d29a 100644
--- a/t/tests/binaries-embedded-zlib/desc
+++ b/t/tests/binaries-embedded-zlib/desc
@@ -2,7 +2,5 @@ Testname: binaries-embedded-zlib
Sequence: 6000
Architecture: any
Version: 1.0
-Description: Test package with a pseudo binary with an "embedded" zlib
-Test-For:
- embedded-zlib
- apparently-corrupted-elf-binary
+Description: Package with binary with the deflate copyright string
+Test-For: embedded-zlib
diff --git a/t/tests/binaries-embedded-zlib/tags b/t/tests/binaries-embedded-zlib/tags
index 8a3ff8c..53b2442 100644
--- a/t/tests/binaries-embedded-zlib/tags
+++ b/t/tests/binaries-embedded-zlib/tags
@@ -1,4 +1,2 @@
-E: binaries-embedded-zlib: embedded-zlib ./usr/bin/elfobject
-E: binaries-embedded-zlib: statically-linked-binary ./usr/bin/elfobject
-W: binaries-embedded-zlib: apparently-corrupted-elf-binary ./usr/bin/elfobject
-W: binaries-embedded-zlib: binary-without-manpage usr/bin/elfobject
+E: binaries-embedded-zlib: embedded-zlib ./usr/bin/dummy
+W: binaries-embedded-zlib: binary-without-manpage usr/bin/dummy
--
Debian package checker
Reply to: