diff -Nru chromium-browser-43.0.2357.130/debian/changelog chromium-browser-43.0.2357.130/debian/changelog --- chromium-browser-43.0.2357.130/debian/changelog 2015-06-30 15:03:54.000000000 +0000 +++ chromium-browser-43.0.2357.130/debian/changelog 2015-07-23 14:35:23.000000000 +0000 @@ -1,3 +1,11 @@ +chromium-browser (43.0.2357.130-0ubuntu2) wily; urgency=medium + + * test-dep on imagemagick - we use 'convert' + * whitelist some "error" messages in the test runner which are actually + harmless. + + -- Iain Lane Thu, 23 Jul 2015 15:35:23 +0100 + chromium-browser (43.0.2357.130-0ubuntu1.1188) wily; urgency=medium * Upstream release 43.0.2357.130: diff -Nru chromium-browser-43.0.2357.130/debian/tests/control chromium-browser-43.0.2357.130/debian/tests/control --- chromium-browser-43.0.2357.130/debian/tests/control 2015-06-30 15:03:54.000000000 +0000 +++ chromium-browser-43.0.2357.130/debian/tests/control 2015-07-23 14:32:42.000000000 +0000 @@ -1,4 +1,4 @@ Tests: smoketest Depends: xvfb, bash, python3-minimal, unity-chromium-extension, libsikuli-script-java, metacity, x11-apps, python3-httplib2, - dbus-x11 + dbus-x11, imagemagick diff -Nru chromium-browser-43.0.2357.130/debian/tests/smoketest-actual chromium-browser-43.0.2357.130/debian/tests/smoketest-actual --- chromium-browser-43.0.2357.130/debian/tests/smoketest-actual 2015-06-30 15:03:54.000000000 +0000 +++ chromium-browser-43.0.2357.130/debian/tests/smoketest-actual 2015-07-23 14:34:23.000000000 +0000 @@ -103,13 +103,15 @@ kill -USR1 $$ +OKAY_ERRORS="(libdc1394 error: Failed to initialize libdc1394|Couldn't load libexif.)" + for sikulitest in $SRCDIR/debian/tests/testdata/*.sikuli; do testname=${sikulitest#$SRCDIR/testdata/} test -d $sikulitest echo -n "Test $(basename ${testname}): " sikuli $sikulitest &>${testname}-log - if egrep -i "(exception|error)" ${testname}-log; then + if egrep -i "(exception|error)" ${testname}-log | egrep -v "${OKAY_ERRORS}"; then failures="$(basename $testname) $failures" echo "BAD" cat -n ${testname}-log