Ubuntu One Client

Merge lp:~verterok/ubuntuone-client/use-available-reactor into lp:ubuntuone-client

  1. use-available-reactor
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 1192
Merged at revision: 1194
Proposed branch: lp:~verterok/ubuntuone-client/use-available-reactor
Merge into: lp:ubuntuone-client
Diff against target: 35 lines (+9/-2)
2 files modified
Makefile.am (+2/-2)
configure.ac (+7/-0)
To merge this branch: bzr merge lp:~verterok/ubuntuone-client/use-available-reactor
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Facundo Batista (community) Approve
Review via email: mp+92495@code.launchpad.net

Commit message

Use the glib reactor to run the tests if the lsb_release -r < 12.04.

Description of the change

This branch changes the Makefile to use the glib reactor to run the tests if the lsb_release -r < 12.04.

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) :
review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

Everything works 'fine' on the Windows world!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-01-25 22:42:17 +0000
3+++ Makefile.am 2012-02-10 15:28:14 +0000
4@@ -53,13 +53,13 @@
5 test: logging.conf $(clientdefs_DATA) Makefile
6 echo "$(PYTHONPATH)"
7 if test "x$(builddir)" == "x$(srcdir)"; then \
8- PYTHONPATH="$(PYTHONPATH)" u1trial -r gi -p tests/platform/windows tests; \
9+ PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows tests; \
10 fi
11 rm -rf _trial_temp
12
13 test-coverage: logging.conf $(clientdefs_DATA) Makefile
14 if test "x$(builddir)" == "x$(srcdir)"; then \
15- PYTHONPATH="$(PYTHONPATH)" u1trial -r gi -c -p tests/platform/windows tests; \
16+ PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows tests; \
17 fi
18 rm -rf _trial_temp
19
20
21=== modified file 'configure.ac'
22--- configure.ac 2011-11-14 18:18:38 +0000
23+++ configure.ac 2012-02-10 15:28:14 +0000
24@@ -219,4 +219,11 @@
25 docs/reference/Makefile
26 ])
27
28+if [[ -n "$(lsb_release -r | grep -v '1[2-9].[0-9][0-9]')" ]]; then
29+ REACTOR="glib";
30+else
31+ REACTOR="gi"
32+fi
33+AC_SUBST(REACTOR)
34+
35 AC_OUTPUT

Subscribers

People subscribed via source and target branches