Merge lp://qastaging/~gordallott/unity/unity-headless into lp://qastaging/unity
Proposed by
Gord Allott
Status: | Merged |
---|---|
Merged at revision: | 1742 |
Proposed branch: | lp://qastaging/~gordallott/unity/unity-headless |
Merge into: | lp://qastaging/unity |
Diff against target: |
1430 lines (+690/-521) 10 files modified
CMakeLists.txt (+10/-3) standalone-clients/CMakeLists.txt (+457/-0) tests/CMakeLists.txt (+65/-445) tests/data/bzr-handle-patch.desktop (+10/-0) tests/data/ubuntu-software-center.desktop (+12/-0) tests/data/ubuntuone-installer.desktop (+12/-0) tests/test_favorite_store_gsettings.cpp (+17/-11) tests/test_main.cpp (+0/-62) tests/test_main_dbus.cpp (+85/-0) tests/test_main_xless.cpp (+22/-0) |
To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/unity-headless |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Needs Fixing | ||
Review via email:
|
Description of the change
changes our build system so we provide two targets for tests
make check runs all our tests
make check-headless runs only the tests that work under a headless environment (xvfb does not work for our needs)
what is expected is that on headless machines we can run make check-headless || make check; so that we get as many tests as possible, but most dev's need only run make check
also included is fixes to the gsettings favorite backend test so that we run with local desktop files only and run local gsettings schemas
To post a comment you must log in.
so, putting on hold right now as discussed with gord, it's hanging in the pbuilder: paste.ubuntu. com/752637/
Hanging on:
http://
when trying to add return (printf doesn't work), it seems to block on g_signal_ emit_by_ name(test_ signals_ , "signal4",
"test", 100, 200.0f, 300.00);
nothing obvious when attaching a pid. However, I'm not sure I'm attaching the right one (here are the pids in the pbuilder: http:// paste.ubuntu. com/752716/)