[SCM] Debian package checker branch, master, updated. 2.3.4-90-g45ab5f1
The following commit has been merged in the master branch:
commit b5a982299766b0b0b8d14d223286029c8233d890
Author: Raphael Geissert <atomo64@gmail.com>
Date: Wed Apr 7 13:18:32 2010 -0500
Merge embedded-*lib* tests into one
diff --git a/t/tests/binaries-embedded-libpng/debian/Makefile b/t/tests/binaries-embedded-libpng/debian/Makefile
deleted file mode 100644
index 8fb317e..0000000
--- a/t/tests/binaries-embedded-libpng/debian/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-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-libpng/desc b/t/tests/binaries-embedded-libpng/desc
deleted file mode 100644
index e8cdcae..0000000
--- a/t/tests/binaries-embedded-libpng/desc
+++ /dev/null
@@ -1,6 +0,0 @@
-Testname: binaries-embedded-libpng
-Sequence: 6000
-Architecture: any
-Version: 1.0
-Description: Package with binary with the png_zalloc error string
-Test-For: embedded-libpng
diff --git a/t/tests/binaries-embedded-libpng/tags b/t/tests/binaries-embedded-libpng/tags
deleted file mode 100644
index f68dee2..0000000
--- a/t/tests/binaries-embedded-libpng/tags
+++ /dev/null
@@ -1,2 +0,0 @@
-E: binaries-embedded-libpng: embedded-libpng ./usr/bin/dummy
-W: binaries-embedded-libpng: binary-without-manpage usr/bin/dummy
diff --git a/t/tests/binaries-embedded-libs/debian/Makefile b/t/tests/binaries-embedded-libs/debian/Makefile
new file mode 100644
index 0000000..2a763d2
--- /dev/null
+++ b/t/tests/binaries-embedded-libs/debian/Makefile
@@ -0,0 +1,17 @@
+BINARIES := zlib libpng
+
+all: $(BINARIES)
+
+%: %.c
+ gcc -o $* $*.c
+
+install:
+ install -d $(DESTDIR)/usr/bin
+ for b in $(BINARIES); do \
+ install -m 755 -c $$b $(DESTDIR)/usr/bin/$$b; \
+ done
+
+clean distclean:
+ rm -f $(BINARIES)
+
+check test:
diff --git a/t/tests/binaries-embedded-libpng/debian/dummy.c b/t/tests/binaries-embedded-libs/debian/libpng.c
similarity index 100%
rename from t/tests/binaries-embedded-libpng/debian/dummy.c
rename to t/tests/binaries-embedded-libs/debian/libpng.c
diff --git a/t/tests/binaries-embedded-zlib/debian/dummy.c b/t/tests/binaries-embedded-libs/debian/zlib.c
similarity index 100%
rename from t/tests/binaries-embedded-zlib/debian/dummy.c
rename to t/tests/binaries-embedded-libs/debian/zlib.c
diff --git a/t/tests/binaries-embedded-libs/desc b/t/tests/binaries-embedded-libs/desc
new file mode 100644
index 0000000..e2eff6e
--- /dev/null
+++ b/t/tests/binaries-embedded-libs/desc
@@ -0,0 +1,8 @@
+Testname: binaries-embedded-libs
+Sequence: 6000
+Architecture: any
+Version: 1.0
+Description: Package with binary with library-unique strings
+Test-For:
+ embedded-zlib
+ embedded-libpng
diff --git a/t/tests/binaries-embedded-libs/tags b/t/tests/binaries-embedded-libs/tags
new file mode 100644
index 0000000..f32be42
--- /dev/null
+++ b/t/tests/binaries-embedded-libs/tags
@@ -0,0 +1,4 @@
+E: binaries-embedded-libs: embedded-libpng ./usr/bin/libpng
+E: binaries-embedded-libs: embedded-zlib ./usr/bin/zlib
+W: binaries-embedded-libs: binary-without-manpage usr/bin/libpng
+W: binaries-embedded-libs: binary-without-manpage usr/bin/zlib
diff --git a/t/tests/binaries-embedded-zlib/debian/Makefile b/t/tests/binaries-embedded-zlib/debian/Makefile
deleted file mode 100644
index 8fb317e..0000000
--- a/t/tests/binaries-embedded-zlib/debian/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-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/desc b/t/tests/binaries-embedded-zlib/desc
deleted file mode 100644
index 837d29a..0000000
--- a/t/tests/binaries-embedded-zlib/desc
+++ /dev/null
@@ -1,6 +0,0 @@
-Testname: binaries-embedded-zlib
-Sequence: 6000
-Architecture: any
-Version: 1.0
-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
deleted file mode 100644
index 53b2442..0000000
--- a/t/tests/binaries-embedded-zlib/tags
+++ /dev/null
@@ -1,2 +0,0 @@
-E: binaries-embedded-zlib: embedded-zlib ./usr/bin/dummy
-W: binaries-embedded-zlib: binary-without-manpage usr/bin/dummy
--
Debian package checker
Reply to: