← Back to branch summary

~ted/ubuntu-app-launch/drop-surface-flinger

« back to all changes in this revision

Viewing changes to tests/exec-util-test.cc

  • Committer: CI bot
  • Author(s): Colin Watson
  • Date: 2014-03-21 17:55:56 UTC
  • mfrom: (135.2.3 libclick-pkgdir)
  • Revision ID: ps-jenkins@lists.canonical.com-20140321175556-6mxaskq0d5q4um3t
Use libclick to get the package directory, saving about 0.7 seconds from Click application startup (on mako). 

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/exec-util-test.cc
90
90
        DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
91
91
 
92
92
        g_setenv("APP_ID", "com.test.good_application_1.2.3", TRUE);
 
93
        g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
 
94
        g_setenv("TEST_CLICK_USER", "test-user", TRUE);
93
95
 
94
96
        g_spawn_command_line_sync(CLICK_EXEC_TOOL, NULL, NULL, NULL, NULL);
95
97
 
114
116
        bool got_app_desktop = false;
115
117
        bool got_app_desktop_path = false;
116
118
 
 
119
#define APP_DIR CMAKE_SOURCE_DIR "/click-root-dir/.click/users/test-user/com.test.good"
 
120
 
117
121
        for (i = 0; i < len; i++) {
118
122
                EXPECT_STREQ("SetEnv", calls[i].name);
119
123
 
139
143
                } else if (g_strcmp0(var, "XDG_RUNTIME_DIR") == 0) {
140
144
                        got_runtime_dir = true;
141
145
                } else if (g_strcmp0(var, "XDG_DATA_DIRS") == 0) {
142
 
                        EXPECT_TRUE(g_str_has_prefix(value, CMAKE_SOURCE_DIR "/click-app-dir:"));
 
146
                        EXPECT_TRUE(g_str_has_prefix(value, APP_DIR ":"));
143
147
                        got_data_dirs = true;
144
148
                } else if (g_strcmp0(var, "TMPDIR") == 0) {
145
149
                        EXPECT_TRUE(g_str_has_suffix(value, "com.test.good"));
148
152
                        EXPECT_TRUE(g_str_has_suffix(value, "com.test.good"));
149
153
                        got_shader_dir = true;
150
154
                } else if (g_strcmp0(var, "APP_DIR") == 0) {
151
 
                        EXPECT_STREQ(CMAKE_SOURCE_DIR "/click-app-dir", value);
 
155
                        EXPECT_STREQ(APP_DIR, value);
152
156
                        got_app_dir = true;
153
157
                } else if (g_strcmp0(var, "APP_EXEC") == 0) {
154
158
                        EXPECT_STREQ("foo", value);
156
160
                } else if (g_strcmp0(var, "APP_DESKTOP_FILE") == 0) {
157
161
                        got_app_desktop = true;
158
162
                } else if (g_strcmp0(var, "APP_DESKTOP_FILE_PATH") == 0) {
159
 
                        EXPECT_STREQ(CMAKE_SOURCE_DIR "/click-app-dir/application.desktop", value);
 
163
                        EXPECT_STREQ(APP_DIR "/application.desktop", value);
160
164
                        got_app_desktop_path = true;
161
165
                } else {
162
166
                        g_warning("Unknown variable! %s", var);
166
170
                g_free(var);
167
171
        }
168
172
 
 
173
#undef APP_DIR
 
174
 
169
175
        EXPECT_TRUE(got_app_isolation);
170
176
        EXPECT_TRUE(got_cache_home);
171
177
        EXPECT_TRUE(got_config_home);