GNOME Bugzilla – Bug 749593
Miscellaneous test fixes
Last modified: 2015-05-24 19:16:31 UTC
See attached patches.
Created attachment 303615 [details] [review] parse-sass: don't hardcode bash path It's /bin/bash on some systems; use /usr/bin/env to find out.
Created attachment 303616 [details] [review] Use built-in gtk-update-icon-cache To generate the icon cache files. Some systems rename these files on installation, to avoid conflicts with the GTK2 versions. Just use the ones we built in-tree to avoid problems.
Created attachment 303617 [details] [review] tests: wait for draw before fetching tree view style On some slower machines (e.g. an ARM OBS builder), this test is failing with a race condition where we're trying to fetch the style before it's applied.
Review of attachment 303615 [details] [review]: Come on, thats ridiculous. Just make it #! /bin/sh
Review of attachment 303617 [details] [review]: hmm, ok
Review of attachment 303616 [details] [review]: but what are the problems ? if they rename them to avoid conflict with an already-installed gtk-update-icon-cache, we'll just use that already-installed one...
Created attachment 303787 [details] [review] parse-sass: don't hardcode bash path It's /bin/bash on some systems; just use /bin/sh instead.
Created attachment 303788 [details] [review] Use built-in gtk-update-icon-cache To generate the icon cache files. We want to avoid a dependency loop if possible; additionally, on some Debian-based systems gtk-update-icon-cache maps to the GTK2 version of the utility and the GTK3 version is renamed to gtk-update-icon-cache-3.0. To avoid a build dependency on GTK2, use the binary that we just built in-tree.
Thanks for the review Matthias. I fixed the shebang line in parse-sass to reference /bin/sh and expanded the commit message for the gtk-update-icon-cache patch to include some more rationale on why I think this is a good idea.
Review of attachment 303787 [details] [review]: ok
Review of attachment 303788 [details] [review]: I was wondering if this would be a problem for cross builders, but I guess we're already skipping that part here via test - n "$(DESTDIR)". Are you not doing DESTDIR builds ?
I think builds of the debian packages by the OBS builder will be DESTDIR, but the packaging will also make sure to separately trigger an icon cache update when the package is installed on the machine. That patch was needed to fix failures in a Jenkins continuous integration builder that basically just runs make distcheck to prepare the sources for the debian OBS builder.
Pushed these to master, thanks. Attachment 303617 [details] pushed as cfbd862 - tests: wait for draw before fetching tree view style Attachment 303787 [details] pushed as 02be889 - parse-sass: don't hardcode bash path Attachment 303788 [details] pushed as 345f2a4 - Use built-in gtk-update-icon-cache