libunity

Merge lp:~mhr3/libunity/fix-1069831 into lp:libunity

  1. fix-1069831
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 192
Merged at revision: 192
Proposed branch: lp:~mhr3/libunity/fix-1069831
Merge into: lp:libunity
Diff against target: 107 lines (+21/-49)
4 files modified
Makefile.decl (+20/-0)
test/Makefile.am (+1/-1)
test/python/Makefile.am (+0/-24)
test/vala/Makefile.am (+0/-24)
To merge this branch: bzr merge lp:~mhr3/libunity/fix-1069831
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+131627@code.launchpad.net

Commit message

Fix headless-tests

Description of the change

Fix headless-tests.

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.decl'
2--- Makefile.decl 2012-10-09 09:19:27 +0000
3+++ Makefile.decl 2012-10-26 14:45:26 +0000
4@@ -70,6 +70,26 @@
5 # run tests in cwd as part of make check
6 if ENABLE_HEADLESS_TESTS
7 check-local: test-headless
8+
9+DISPLAY = :27
10+LOG_PATH = headless-logs
11+test-headless:
12+ set -e; \
13+ export DISPLAY=$(DISPLAY); \
14+ rm -rf $(LOG_PATH); \
15+ mkdir $(LOG_PATH); \
16+ $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
17+ sleep 1; \
18+ \
19+ $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
20+ source $(LOG_PATH)/sessionbus.sh; \
21+ sleep 1; \
22+ \
23+ make test-nonrecursive; \
24+ sleep 1; \
25+ \
26+ kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
27+ pkill Xvfb;
28 else
29 check-local: test-nonrecursive
30 endif
31
32=== modified file 'test/Makefile.am'
33--- test/Makefile.am 2012-10-09 09:19:27 +0000
34+++ test/Makefile.am 2012-10-26 14:45:26 +0000
35@@ -2,7 +2,7 @@
36
37 SUBDIRS = vala C python
38
39-EXTRA_DIST = \
40+EXTRA_DIST += \
41 data/applications/ubuntu-about.desktop \
42 data/applications/asdasdasd.desktop \
43 data/scope0.scope \
44
45=== modified file 'test/python/Makefile.am'
46--- test/python/Makefile.am 2012-10-17 09:08:43 +0000
47+++ test/python/Makefile.am 2012-10-26 14:45:26 +0000
48@@ -15,27 +15,3 @@
49 PY_LOG_COMPILER = $(PYTHON)
50 AM_PY_LOG_FLAGS =
51
52-# START HEADLESS TESTS
53-if ENABLE_HEADLESS_TESTS
54-DISPLAY = :27
55-LOG_PATH = headless-logs
56-test-headless:
57- set -e; \
58- export DISPLAY=$(DISPLAY); \
59- rm -rf $(LOG_PATH); \
60- mkdir $(LOG_PATH); \
61- $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
62- sleep 1; \
63- \
64- $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
65- source $(LOG_PATH)/sessionbus.sh; \
66- sleep 1; \
67- \
68- make test; \
69- sleep 1; \
70- \
71- kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
72- pkill Xvfb;
73-
74-endif
75-# END HEADLESS TESTS
76
77=== modified file 'test/vala/Makefile.am'
78--- test/vala/Makefile.am 2012-09-26 08:45:52 +0000
79+++ test/vala/Makefile.am 2012-10-26 14:45:26 +0000
80@@ -97,27 +97,3 @@
81 $(test_remote_scope_VALASOURCES:.vala=.c) \
82 $(NULL)
83
84-# START HEADLESS TESTS
85-if ENABLE_HEADLESS_TESTS
86-DISPLAY = :27
87-LOG_PATH = headless-logs
88-test-headless:
89- set -e; \
90- export DISPLAY=$(DISPLAY); \
91- rm -rf $(LOG_PATH); \
92- mkdir $(LOG_PATH); \
93- $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
94- sleep 1; \
95- \
96- $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
97- source $(LOG_PATH)/sessionbus.sh; \
98- sleep 1; \
99- \
100- make test; \
101- sleep 1; \
102- \
103- kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
104- pkill Xvfb;
105-
106-endif
107-# END HEADLESS TESTS

Subscribers

People subscribed via source and target branches