Commit 20f3f796 authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

server: fixing Vala installation vapi dirs

parent 7d8d061c
Pipeline #43510 passed with stages
in 14 minutes and 44 seconds
option('vala-version', type: 'string', value : '', description : 'Use another version of Vala (only the latest is officially supported)')
option('ui-test-interactive', type: 'boolean', value : 'True', description : 'Makes UI tests interactive, so auto-close is disable')
\ No newline at end of file
option('ui-test-interactive', type: 'boolean', value : 'false', description : 'Makes UI tests interactive, so auto-close is disable')
vapidir = join_paths (get_option('prefix'), get_option('datadir'),'vala','vapi')
vapidir = join_paths (vala_dep.get_pkgconfig_variable ('datarootdir'),'vala','vapi')
GIR_NAME= VERSIONED_CAMEL_CASE_NAME+'.gir'
TYPELIB_NAME= VERSIONED_CAMEL_CASE_NAME+'.typelib'
VAPI_NAME = VERSIONED_PROJECT_NAME+'.vapi'
......
......@@ -332,10 +332,10 @@ class Tests {
server.add_default_vapi_dirs ();
message ("VAPI dirs: %u", server.vapi_dirs.get_n_items ());
assert (server.vapi_dirs.get_n_items () >= 1);
server.add_namespace ("Gee");
assert (server.get_symbol ("Gee") != null);
server.add_namespace ("Vala");
assert (server.get_symbol ("Vala") != null);
server.add_namespace ("GLib");
assert (server.get_symbol ("GLib") != null);
server.add_namespace ("Gtk");
assert (server.get_symbol ("Gtk") != null);
} catch (GLib.Error e) {
message ("Error: %s", e.message);
assert_not_reached ();
......@@ -354,7 +354,10 @@ class Tests {
try {
server.add_server (server1);
server1.parse (file2);
assert (server.vapi_dirs.get_n_items () == 3);
var ndirs = server.vapi_dirs.get_n_items ();
message ("Local Dirs number: %u", ndirs);
/* 3 if prefix is /usr, 2 in other cases */
assert (ndirs == 3 || ndirs == 2);
assert (server.add_namespace ("Test"));
assert (server.get_symbol ("Test") != null);
} catch (GLib.Error e) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment