platform-api

Merge lp:~ricmm/platform-api/fix-wrong-test-load into lp:platform-api

  1. fix-wrong-test-load
  2. Merge into trunk
Proposed by Ricardo Mendoza on 2015-02-02
Status: Merged
Approved by: Sebastien Bacher on 2015-02-03
Approved revision: 295
Merged at revision: 292
Proposed branch: lp:~ricmm/platform-api/fix-wrong-test-load
Merge into: lp:platform-api
Diff against target: 91 lines (+13/-6)
8 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
debian/control (+1/-0)
src/bridge/bridge.h (+1/-1)
src/ubuntu/application/base_module.h (+1/-1)
src/ubuntu/application/desktop/module_version.h (+1/-1)
src/ubuntu/application/testbackend/module_version.h (+1/-1)
src/ubuntu/application/touch/module_version.h (+1/-1)
To merge this branch: bzr merge lp:~ricmm/platform-api/fix-wrong-test-load
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-02-02 Approve on 2015-02-03
PS Jenkins bot continuous-integration Approve on 2015-02-03
Review via email: mp+248228@code.launchpad.net

Commit Message

Do not load the test backend unless a specific override list is provided. Also, add the test backend as dependency of the main module, now that it is directly usable without other modules.

To post a comment you must log in.
lp:~ricmm/platform-api/fix-wrong-test-load updated on 2015-02-02
294. By Ricardo Mendoza on 2015-02-02

Bump version

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~ricmm/platform-api/fix-wrong-test-load updated on 2015-02-03
295. By Ricardo Mendoza on 2015-02-03

Bump base modules

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Sebastien Bacher (seb128) wrote :

confirmed to fix the issue, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-01-21 15:47:48 +0000
3+++ CMakeLists.txt 2015-02-03 11:59:00 +0000
4@@ -3,7 +3,7 @@
5 project(ubuntu-platform-api)
6
7 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
8-set(UBUNTU_PLATFORM_API_VERSION_MINOR 7)
9+set(UBUNTU_PLATFORM_API_VERSION_MINOR 8)
10 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
11
12 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-01-28 14:07:59 +0000
16+++ debian/changelog 2015-02-03 11:59:00 +0000
17@@ -1,3 +1,9 @@
18+platform-api (2.8.0) UNRELEASED; urgency=medium
19+
20+ * Add -test module as dependency of base, and don't load unless needed.
21+
22+ -- Ricardo Mendoza <ricardo.mendoza@canonical.com> Mon, 02 Feb 2015 12:48:29 +0100
23+
24 platform-api (2.7.0+15.04.20150128-0ubuntu1) vivid; urgency=low
25
26 [ You-Sheng Yang ]
27
28=== modified file 'debian/control'
29--- debian/control 2014-11-14 15:30:22 +0000
30+++ debian/control 2015-02-03 11:59:00 +0000
31@@ -149,6 +149,7 @@
32 Multi-Arch: same
33 Depends: ${misc:Depends},
34 ${shlibs:Depends},
35+ ubuntu-application-api2-test,
36 Description: Hybris implementation of the Platform API (runtime)
37 This package provides the hybris implementation of the Platform API.
38 .
39
40=== modified file 'src/bridge/bridge.h'
41--- src/bridge/bridge.h 2015-01-21 15:45:46 +0000
42+++ src/bridge/bridge.h 2015-02-03 11:59:00 +0000
43@@ -57,7 +57,7 @@
44 Bridge()
45 : lib_handle(Scope::dlopen_fn(Scope::path(), RTLD_LAZY))
46 {
47- if (Scope::override_path())
48+ if (Scope::override_path() && secure_getenv("UBUNTU_PLATFORM_API_TEST_OVERRIDE"))
49 lib_override_handle = (Scope::dlopen_fn(Scope::override_path(), RTLD_LAZY));
50 }
51
52
53=== modified file 'src/ubuntu/application/base_module.h'
54--- src/ubuntu/application/base_module.h 2015-01-21 15:47:48 +0000
55+++ src/ubuntu/application/base_module.h 2015-02-03 11:59:00 +0000
56@@ -28,7 +28,7 @@
57 */
58
59 #define API_VERSION_MAJOR "2"
60-#define API_VERSION_MINOR "7"
61+#define API_VERSION_MINOR "8"
62 #define API_VERSION_PATCH "0"
63 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
64
65
66=== modified file 'src/ubuntu/application/desktop/module_version.h'
67--- src/ubuntu/application/desktop/module_version.h 2015-01-21 15:47:48 +0000
68+++ src/ubuntu/application/desktop/module_version.h 2015-02-03 11:59:00 +0000
69@@ -1,3 +1,3 @@
70 #define MODULE_VERSION_MAJOR 2
71-#define MODULE_VERSION_MINOR 7
72+#define MODULE_VERSION_MINOR 8
73 #define MODULE_VERSION_PATCH 0
74
75=== modified file 'src/ubuntu/application/testbackend/module_version.h'
76--- src/ubuntu/application/testbackend/module_version.h 2015-01-21 15:47:48 +0000
77+++ src/ubuntu/application/testbackend/module_version.h 2015-02-03 11:59:00 +0000
78@@ -1,3 +1,3 @@
79 #define MODULE_VERSION_MAJOR 2
80-#define MODULE_VERSION_MINOR 7
81+#define MODULE_VERSION_MINOR 8
82 #define MODULE_VERSION_PATCH 0
83
84=== modified file 'src/ubuntu/application/touch/module_version.h'
85--- src/ubuntu/application/touch/module_version.h 2015-01-21 15:47:48 +0000
86+++ src/ubuntu/application/touch/module_version.h 2015-02-03 11:59:00 +0000
87@@ -1,3 +1,3 @@
88 #define MODULE_VERSION_MAJOR 2
89-#define MODULE_VERSION_MINOR 7
90+#define MODULE_VERSION_MINOR 8
91 #define MODULE_VERSION_PATCH 0

Subscribers

People subscribed via source and target branches