[Pkg-shotwell-maint] Bug#750985: broken autopkgtest

[Martin Pitt]

Package: libraw
Version: 0.16.0-4
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch utopic
User: autopkgtest-devel at lists.alioth.debian.org
Usertags: autopkgtest

Hello,

thanks for adding an autopkgtest to libraw! However, it has several
problems:

 - It fails with "test.c:1:27: fatal error: libraw/libraw.h: No such
   file or directory" [1] as the test doesn't depend on libraw-dev

 - The test doesn't need @builddeps at . libraw-dev ought to depend on
   anything that it needs by itself, that's the point of having an
   autopkgtest :)

 - The test is not set -e and thus continues after the failed
   compilation (also visible in [1])

 - The linking order is wrong and doesn't work with --as-needed /
   binutils-gold (see [2] for details).

The attached patch fixes everything. Tested with

  adt-run -B libraw_0.16.0-4ubuntu1.dsc --- schroot utopic

Thanks for considering,

Martin

[1] https://jenkins.qa.ubuntu.com/job/utopic-adt-libraw/1/ARCH=i386,label=adt/console
[2] https://wiki.debian.org/ToolChain/DSOLinking
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru libraw-0.16.0/debian/changelog libraw-0.16.0/debian/changelog
--- libraw-0.16.0/debian/changelog	2014-06-07 18:44:21.000000000 +0200
+++ libraw-0.16.0/debian/changelog	2014-06-09 11:41:17.000000000 +0200
@@ -1,3 +1,11 @@
+libraw (0.16.0-4ubuntu1) utopic; urgency=medium
+
+  * Fix autopkgtest: Add missing libraw-dev test dep, drop unnecessary
+    @builddeps@, and add missing "set -e" so that the test actually fails
+    properly. Also fix linking order to also work with binutils-gold.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 09 Jun 2014 11:38:59 +0200
+
 libraw (0.16.0-4) unstable; urgency=medium
 
   * debian/libraw10.symbols:
diff -Nru libraw-0.16.0/debian/tests/control libraw-0.16.0/debian/tests/control
--- libraw-0.16.0/debian/tests/control	2014-06-07 18:20:40.000000000 +0200
+++ libraw-0.16.0/debian/tests/control	2014-06-09 11:38:28.000000000 +0200
@@ -1,3 +1,3 @@
 Tests: testbuild
-Depends: @builddeps@,
+Depends: libraw-dev,
          build-essential
diff -Nru libraw-0.16.0/debian/tests/testbuild libraw-0.16.0/debian/tests/testbuild
--- libraw-0.16.0/debian/tests/testbuild	2014-06-07 18:26:14.000000000 +0200
+++ libraw-0.16.0/debian/tests/testbuild	2014-06-09 11:40:48.000000000 +0200
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 cd "$ADTTMP"
 cat > test.c << EOF
@@ -14,6 +15,6 @@
 }
 
 EOF
-g++ -Wall -Wl,-lraw -o test test.c
+g++ -Wall -o test test.c -lraw
 ./test
 objdump -p test | grep "libraw"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-shotwell-maint/attachments/20140609/836a5bc9/attachment.sig>