|
Description
Simon McVittie
2013-06-03 10:26:48 UTC
Created attachment 80200 [details] [review] Update Wocky to fix a regression caused by #65131 --- Yes I realise this can't really be reviewed... it's mainly a reminder that a couple of patches from Bug #65131 need review first. Created attachment 80201 [details] [review] Officially depend on GLib 2.32 In practice we depend on it anyway, via telepathy-glib 0.19.9. Also update the telepathy-glib dependency in the .pc files to match configure.ac. Created attachment 80209 [details] [review] .gitignore: automake 1.13 installs test-driver Created attachment 80211 [details] [review] Adapt run-test.sh to be able to run the tests uninstalled When autoreconfiscated with Automake 1.13, the way in which we were (ab?)using Automake's test driver no longer works. We can't just switch back to the old serial test driver without a dependency on at least Automake 1.12, either. However, run-test.sh (which was already used for installed tests) is quite capable of running uninstalled tests, with a bit of adjustment: * if GABBLE_TEST_UNINSTALLED is set, expect GABBLE_ABS_TOP_SRCDIR, GABBLE_ABS_TOP_BUILDDIR and optionally GABBLE_TEST_SLEEP in the environment * look for installed or uninstalled files, as appropriate * use TEST_PYTHON (which might differ from PYTHON) * use python -u (unbuffered stdout) for better debugging Created attachment 80212 [details] [review] Use run-test.sh to run uninstalled tests Created attachment 80221 [details] [review] Remove obsolete GLib < 2.32 code paths We now depend on 2.32. --- Follow-up for Attachment #80201 [details]. Created attachment 80227 [details] [review] run-test.sh: keep a single Gabble and dbus-daemon during "make check" This cuts "make check" from 5:22 down to 4:58 on my X220. Created attachment 80232 [details] [review] [Rakia] Adapt tests to be compatible with Automake 1.13 Instead of (ab)using the check-TESTS target and the TESTS_ENVIRONMENT variable, we now run the tests from a shell script similar to the one in telepathy-gabble. Created attachment 80283 [details] [review] [Rakia] Adapt tests to be compatible with Automake 1.13 --- My previous Rakia patch put run-tests.sh in TESTS, but that means you don't get any feedback when the individual tests are running, which isn't ideal. One day we should implement an Automake 1.13 "test driver" but for now let's just get the tests passing again. Created attachment 80284 [details] [review] [Haze] Avoid recent libpurple doing "clever" proxy discovery, etc. The regression tests are not a full desktop session, and don't have GSettings or other GNOME features. They also don't have KDE features, which libpurple also checks. Created attachment 80285 [details] [review] [Haze] Adapt tests to be compatible with Automake 1.13 Instead of (ab)using the check-TESTS target and the TESTS_ENVIRONMENT variable, we now run the tests from a shell script similar to the one in telepathy-gabble. Comment on attachment 80201 [details] [review] Officially depend on GLib 2.32 Review of attachment 80201 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80209 [details] [review] .gitignore: automake 1.13 installs test-driver Review of attachment 80209 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80211 [details] [review] Adapt run-test.sh to be able to run the tests uninstalled Review of attachment 80211 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80212 [details] [review] Use run-test.sh to run uninstalled tests Review of attachment 80212 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80221 [details] [review] Remove obsolete GLib < 2.32 code paths Review of attachment 80221 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80283 [details] [review] [Rakia] Adapt tests to be compatible with Automake 1.13 Review of attachment 80283 [details] [review]: ----------------------------------------------------------------- Assuming it is the same than what's in gabble, +1 Comment on attachment 80284 [details] [review] [Haze] Avoid recent libpurple doing "clever" proxy discovery, etc. Review of attachment 80284 [details] [review]: ----------------------------------------------------------------- ok Comment on attachment 80285 [details] [review] [Haze] Adapt tests to be compatible with Automake 1.13 Review of attachment 80285 [details] [review]: ----------------------------------------------------------------- Assuming it is the same than gabble, +1 (In reply to comment #7) > run-test.sh: keep a single Gabble and dbus-daemon during "make check" > > This cuts "make check" from 5:22 down to 4:58 on my X220. < xclaesse> smcv: keep a single Gabble and dbus-daemon during < xclaesse> "make check" --> why do we want that? < xclaesse> smcv, that makes tests less isolated, I don't want previous test to be able to influence the next one... < smcv> xclaesse: it's how the tests work at the moment < smcv> xclaesse: and saves 20 seconds < smcv> xclaesse: I was actually surprised how little time it saved. when it's only 20s out of 5min, I'd be OK with dropping that patch - it simplifies things quite a bit actually < xclaesse> I'm tempted to say that 20s out of 5min is irrelevant, especially since a unit test influancing the next one is potentially days of work to find the problem < smcv> ok < smcv> I'll respin the rakia, haze patches to be similar Comment on attachment 80201 [details] [review] Officially depend on GLib 2.32 0.17.6 Comment on attachment 80209 [details] [review] .gitignore: automake 1.13 installs test-driver 0.17.6 Comment on attachment 80211 [details] [review] Adapt run-test.sh to be able to run the tests uninstalled 0.17.6 Comment on attachment 80212 [details] [review] Use run-test.sh to run uninstalled tests 0.17.6 Comment on attachment 80221 [details] [review] Remove obsolete GLib < 2.32 code paths 0.17.6 Comment on attachment 80227 [details] [review] run-test.sh: keep a single Gabble and dbus-daemon during "make check" rejected Created attachment 80689 [details] [review] [Gabble] run-test.sh.in: make the indentation make sense The Python invocation is indented, because it's a command-line argument for the sh invocation. The case shouldn't be. (In reply to comment #27) > [Gabble] run-test.sh.in: make the indentation make sense Could someone have a quick look at this, please? It's whitespace-only, and I'd like to use Gabble's script as a basis for the other CMs. If nobody wants to veto it, I'll just apply it. Comment on attachment 80689 [details] [review] [Gabble] run-test.sh.in: make the indentation make sense Applied based on review from Guillaume Comment on attachment 80283 [details] [review] [Rakia] Adapt tests to be compatible with Automake 1.13 Still not applied, but is obsoleted by Bug #67872 The two latest patches have been reviewed by Xavier so are good to go I think. -- GitLab Migration Automatic Message -- This bug has been migrated to freedesktop.org's GitLab instance and has been closed from further activity. You can subscribe and participate further through the new bug through this link to our GitLab instance: https://gitlab.freedesktop.org/telepathy/telepathy-gabble/issues/256. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.