Merge lp:~vibhavp/ubuntu/raring/libiptcdata/add-autopkgtest into lp:ubuntu/raring/libiptcdata

[Vibhav Pant]

[Martin Pitt (pitti)]

To make this a bit more palatable for forwarding to Debian, could we use a more neutral test image? Perhaps also one which doesn't have any foreign trademark/copyright? E. g. you could just create a very simple 10x10 pixel jpg in gimp with a checkerboard pattern.

32 +# the sample epub is taken from:
33 +# http://code.google.com/p/epub-samples/wiki/SamplesListing

That looks like copy&paste error.

+ iptc_data_save(iptc, &buf, &bufsize);

If you are doing this already, any chance to validate what it writes into buf? That ought to be a predictable value after all?

Thank you!

review: Needs Fixing

[lp:~vibhavp/ubuntu/raring/libiptcdata/add-autopkgtest]

13. By Vibhav Pant on 2013-02-26

Rewrite tests, replace sample jpeg with Tux logo

14. By Vibhav Pant on 2013-02-26

Fix compiler warnings

15. By Vibhav Pant on 2013-02-26

Attribute author for tux logo.

[Martin Pitt (pitti)]

34 +# the sample epub is taken from:
35 +# http://code.google.com/p/epub-samples/wiki/SamplesListing

Needs to go, and be replaced with proper attribution for tux.jpg. Putting it in the changelog is not enough, as that's not easy to find when you just look at the icon. Best would be to add a separate tux.jpeg.README.

But again, to avoid any potential license violation, it would really be better and easier to create a 10x10 dummy jpg in gimp.

58 + assert(buf != NULL);
59 +
60 +

For merging these lines should be removed, they are useless.

review: Needs Fixing

[Martin Pitt (pitti)]

Also, running this in a VM gives:

adt-run: trace: & ubtree0t-build: - - - - - - - - - - results - - - - - - - - - -
ubtree0t-build FAIL status: 134, stderr: libiptcdata_test: libiptcdata_test....
adt-run: trace: & ubtree0t-build: - - - - - - - - - - stderr - - - - - - - - - -
libiptcdata_test: libiptcdata_test.c:11: main: Assertion `iptc_jpeg_read_ps3(file, buf, sizeof(buf)) == 0' failed.
Aborted (core dumped)

I cannot believe that this works for you when merely running debian/tests/build, as the path would be wrong (it should use $MYDIR for the file name). Please test the scripts before submitting.

[lp:~vibhavp/ubuntu/raring/libiptcdata/add-autopkgtest]

16. By Vibhav Pant on 2013-02-26

The JPEG used here for testing is a dummy 10x10 image created in GIMP.

17. By Vibhav Pant on 2013-02-26

Add sample.jpeg to debian/source/include-binaries, fix directory path for sample jpeg.

18. By Vibhav Pant on 2013-02-26

Add sample.jpeg

[Martin Pitt (pitti)]

This passes in a VM now, thanks!

32 +# the sample epub is taken from:
33 +# http://code.google.com/p/epub-samples/wiki/SamplesListing

This bit still needs to go, but that can be done during merging.

review: Approve

[lp:~vibhavp/ubuntu/raring/libiptcdata/add-autopkgtest]

19. By Vibhav Pant on 2013-02-26

Remove epub line from comment header

[Vibhav Pant (vibhavp)]

@pitti: I think I accidently misundeerstood you. I thought you were quoting the ebook-tools comment where the file source was benig linked.
Ive removed it from headers (silly me). Thanks!

[Martin Pitt (pitti)]

Sorry, this produces an unbuildable source. This is still dpkg source v1, so you cannot include binary files into debian/. You either need to uuencode it (and decode in the test), or include it as a textual representation in the C file itself, or convert the source package to v3.

review: Needs Fixing

[lp:~vibhavp/ubuntu/raring/libiptcdata/add-autopkgtest]

20. By Vibhav Pant on 2013-03-01

Remove binary files, add support for uuencode

21. By Vibhav Pant on 2013-03-01

Add path in tests/build, add test-dep for sharutils.

22. By Vibhav Pant on 2013-03-01

Correct typo

23. By Vibhav Pant on 2013-03-01

Output and read in $WORKDIR, not $MYDIR

[Martin Pitt (pitti)]

Passes now, thanks!

review: Approve

[Martin Pitt (pitti)]

Note that this is missing XS-Testsuite:, I added this during merging. So for forwarding to Debian please use the merged commit.

[Martin Pitt (pitti)]

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/libiptcdata/raring/revision/12

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 15:50:06 +0000
+++ debian/changelog	2013-03-01 10:26:22 +0000
@@ -1,3 +1,10 @@
+libiptcdata (1.0.4-3ubuntu1) raring; urgency=low
+
+  * Add simple autopkgtest to package.
+    - The JPEG used here for testing is a dummy 10x10 image created in GIMP.
+
+ -- Vibhav Pant <[e-mail]>  Tue, 26 Feb 2013 14:02:51 +0530
+
 libiptcdata (1.0.4-3) unstable; urgency=low
 
   * Incorporate patch for docbook manpage generation from Sebastian

=== added directory 'debian/tests'
=== added file 'debian/tests/build'
--- debian/tests/build	1970-01-01 00:00:00 +0000
+++ debian/tests/build	2013-03-01 10:26:22 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+# autopkgtest check: Build and run a program against libiptcdata, to verify that
+# the headers and pkg-config file are installed correctly
+# (C) 2013 Vibhav Pant
+# Author: Vibhav Pant <[e-mail]>
+
+set -e
+
+MYDIR=$(dirname $(readlink -f $0))
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > libiptcdata_test.c
+#include <libiptcdata/iptc-jpeg.h>
+#include <stdio.h>
+#include <assert.h>
+
+int main(void)
+{
+	unsigned char buf[256*256];
+	FILE *file;
+
+	file = fopen("$WORKDIR/sample.jpeg", "r");
+	assert(iptc_jpeg_read_ps3(file, buf, sizeof(buf)) == 0);
+	assert(buf != NULL);
+	return 0;
+}
+EOF
+
+gcc -o libiptcdata_test libiptcdata_test.c -liptcdata -Wall -Werror
+echo "build: OK"
+uudecode $MYDIR/sample.jpeg.base64 -o $WORKDIR/sample.jpeg
+[ -x libiptcdata_test ]
+./libiptcdata_test
+echo "run: OK"

=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-03-01 10:26:22 +0000
@@ -0,0 +1,2 @@
+Tests: build
+Depends: libiptcdata0-dev, build-essential, sharutils

=== added file 'debian/tests/sample.jpeg.base64'
--- debian/tests/sample.jpeg.base64	1970-01-01 00:00:00 +0000
+++ debian/tests/sample.jpeg.base64	2013-03-01 10:26:22 +0000
@@ -0,0 +1,15 @@
+begin-base64 664 sample.jpeg
+/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBD
+AAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsL
+EBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQU
+FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/
+wgARCAAKAAoDAREAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAgMI/8QA
+FAEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEAMQAAAByoUCE//EABcQAQEB
+AQAAAAAAAAAAAAAAAAACEjH/2gAIAQEAAQUCbpXX/8QAFBEBAAAAAAAAAAAA
+AAAAAAAAIP/aAAgBAwEBPwEf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgB
+AgEBPwEf/8QAFhAAAwAAAAAAAAAAAAAAAAAAABAx/9oACAEBAAY/Aiv/xAAa
+EAACAgMAAAAAAAAAAAAAAAAAARARIWGR/9oACAEBAAE/IU6N3pg8f//aAAwD
+AQACAAMAAAAQgk//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/EB//
+xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/EB//xAAaEAEBAAIDAAAA
+AAAAAAAAAAABEQAQQWGh/9oACAEBAAE/EEVFHrAyerCBCF41/9k=
+====