From 0c22b8f7076e9c32a8755936244cf3244f045ba8 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 4 Dec 2016 01:11:10 +0200 Subject: Renamed dirs to plug holes in numbering. --- test cases/vala/10 mixed sources/c/foo.c | 5 +++ test cases/vala/10 mixed sources/c/meson.build | 5 +++ test cases/vala/10 mixed sources/c/writec.py | 12 ++++++++ test cases/vala/10 mixed sources/meson.build | 7 +++++ test cases/vala/10 mixed sources/vala/bar.vala | 5 +++ .../vala/11 generated vapi/installed_files.txt | 7 +++++ test cases/vala/11 generated vapi/libbar/bar.c | 12 ++++++++ test cases/vala/11 generated vapi/libbar/bar.h | 5 +++ .../vala/11 generated vapi/libbar/meson.build | 33 ++++++++++++++++++++ test cases/vala/11 generated vapi/libfoo/foo.c | 11 +++++++ test cases/vala/11 generated vapi/libfoo/foo.h | 5 +++ .../vala/11 generated vapi/libfoo/meson.build | 36 ++++++++++++++++++++++ test cases/vala/11 generated vapi/main.vala | 9 ++++++ test cases/vala/11 generated vapi/meson.build | 13 ++++++++ test cases/vala/11 mixed sources/c/foo.c | 5 --- test cases/vala/11 mixed sources/c/meson.build | 5 --- test cases/vala/11 mixed sources/c/writec.py | 12 -------- test cases/vala/11 mixed sources/meson.build | 7 ----- test cases/vala/11 mixed sources/vala/bar.vala | 5 --- test cases/vala/12 custom output/foo.vala | 0 test cases/vala/12 custom output/meson.build | 9 ++++++ .../vala/12 generated vapi/installed_files.txt | 7 ----- test cases/vala/12 generated vapi/libbar/bar.c | 12 -------- test cases/vala/12 generated vapi/libbar/bar.h | 5 --- .../vala/12 generated vapi/libbar/meson.build | 33 -------------------- test cases/vala/12 generated vapi/libfoo/foo.c | 11 ------- test cases/vala/12 generated vapi/libfoo/foo.h | 5 --- .../vala/12 generated vapi/libfoo/meson.build | 36 ---------------------- test cases/vala/12 generated vapi/main.vala | 9 ------ test cases/vala/12 generated vapi/meson.build | 13 -------- test cases/vala/13 custom output/foo.vala | 0 test cases/vala/13 custom output/meson.build | 9 ------ test cases/vala/13 find library/meson.build | 9 ++++++ test cases/vala/13 find library/test.vala | 6 ++++ test cases/vala/14 find library/meson.build | 9 ------ test cases/vala/14 find library/test.vala | 6 ---- 36 files changed, 189 insertions(+), 189 deletions(-) create mode 100644 test cases/vala/10 mixed sources/c/foo.c create mode 100644 test cases/vala/10 mixed sources/c/meson.build create mode 100644 test cases/vala/10 mixed sources/c/writec.py create mode 100644 test cases/vala/10 mixed sources/meson.build create mode 100644 test cases/vala/10 mixed sources/vala/bar.vala create mode 100644 test cases/vala/11 generated vapi/installed_files.txt create mode 100644 test cases/vala/11 generated vapi/libbar/bar.c create mode 100644 test cases/vala/11 generated vapi/libbar/bar.h create mode 100644 test cases/vala/11 generated vapi/libbar/meson.build create mode 100644 test cases/vala/11 generated vapi/libfoo/foo.c create mode 100644 test cases/vala/11 generated vapi/libfoo/foo.h create mode 100644 test cases/vala/11 generated vapi/libfoo/meson.build create mode 100644 test cases/vala/11 generated vapi/main.vala create mode 100644 test cases/vala/11 generated vapi/meson.build delete mode 100644 test cases/vala/11 mixed sources/c/foo.c delete mode 100644 test cases/vala/11 mixed sources/c/meson.build delete mode 100644 test cases/vala/11 mixed sources/c/writec.py delete mode 100644 test cases/vala/11 mixed sources/meson.build delete mode 100644 test cases/vala/11 mixed sources/vala/bar.vala create mode 100644 test cases/vala/12 custom output/foo.vala create mode 100644 test cases/vala/12 custom output/meson.build delete mode 100644 test cases/vala/12 generated vapi/installed_files.txt delete mode 100644 test cases/vala/12 generated vapi/libbar/bar.c delete mode 100644 test cases/vala/12 generated vapi/libbar/bar.h delete mode 100644 test cases/vala/12 generated vapi/libbar/meson.build delete mode 100644 test cases/vala/12 generated vapi/libfoo/foo.c delete mode 100644 test cases/vala/12 generated vapi/libfoo/foo.h delete mode 100644 test cases/vala/12 generated vapi/libfoo/meson.build delete mode 100644 test cases/vala/12 generated vapi/main.vala delete mode 100644 test cases/vala/12 generated vapi/meson.build delete mode 100644 test cases/vala/13 custom output/foo.vala delete mode 100644 test cases/vala/13 custom output/meson.build create mode 100644 test cases/vala/13 find library/meson.build create mode 100644 test cases/vala/13 find library/test.vala delete mode 100644 test cases/vala/14 find library/meson.build delete mode 100644 test cases/vala/14 find library/test.vala diff --git a/test cases/vala/10 mixed sources/c/foo.c b/test cases/vala/10 mixed sources/c/foo.c new file mode 100644 index 0000000..f3c6fb8 --- /dev/null +++ b/test cases/vala/10 mixed sources/c/foo.c @@ -0,0 +1,5 @@ +int retval (void); + +int test (void) { + return retval (); +} diff --git a/test cases/vala/10 mixed sources/c/meson.build b/test cases/vala/10 mixed sources/c/meson.build new file mode 100644 index 0000000..ead0575 --- /dev/null +++ b/test cases/vala/10 mixed sources/c/meson.build @@ -0,0 +1,5 @@ +writec = find_program('writec.py') + +retval = custom_target('writec', + output : 'retval.c', + command : [writec, '@OUTPUT@']) diff --git a/test cases/vala/10 mixed sources/c/writec.py b/test cases/vala/10 mixed sources/c/writec.py new file mode 100644 index 0000000..2cc822b --- /dev/null +++ b/test cases/vala/10 mixed sources/c/writec.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import sys + +c = '''int +retval(void) { + return 0; +} +''' + +with open(sys.argv[1], 'w') as f: + f.write(c) diff --git a/test cases/vala/10 mixed sources/meson.build b/test cases/vala/10 mixed sources/meson.build new file mode 100644 index 0000000..75b8ecd --- /dev/null +++ b/test cases/vala/10 mixed sources/meson.build @@ -0,0 +1,7 @@ +project('foo', 'c', 'vala') + +glib = dependency('glib-2.0') + +subdir('c') +e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib]) +test('test foo', e) diff --git a/test cases/vala/10 mixed sources/vala/bar.vala b/test cases/vala/10 mixed sources/vala/bar.vala new file mode 100644 index 0000000..10dce1e --- /dev/null +++ b/test cases/vala/10 mixed sources/vala/bar.vala @@ -0,0 +1,5 @@ +extern int test (); + +public int main (string[] args) { + return test (); +} diff --git a/test cases/vala/11 generated vapi/installed_files.txt b/test cases/vala/11 generated vapi/installed_files.txt new file mode 100644 index 0000000..5993d01 --- /dev/null +++ b/test cases/vala/11 generated vapi/installed_files.txt @@ -0,0 +1,7 @@ +usr/bin/vapigen-test +usr/lib/libfoo.so +usr/lib/libbar.so +usr/share/vala/vapi/foo-1.0.vapi +usr/share/vala/vapi/foo-1.0.deps +usr/share/vala/vapi/bar-1.0.vapi +usr/share/vala/vapi/bar-1.0.deps diff --git a/test cases/vala/11 generated vapi/libbar/bar.c b/test cases/vala/11 generated vapi/libbar/bar.c new file mode 100644 index 0000000..f0f5cb8 --- /dev/null +++ b/test cases/vala/11 generated vapi/libbar/bar.c @@ -0,0 +1,12 @@ +#include "bar.h" +#include "foo.h" + +/** + * bar_return_success: + * + * Returns 0 + */ +int bar_return_success(void) +{ + return foo_return_success(); +} diff --git a/test cases/vala/11 generated vapi/libbar/bar.h b/test cases/vala/11 generated vapi/libbar/bar.h new file mode 100644 index 0000000..165b104 --- /dev/null +++ b/test cases/vala/11 generated vapi/libbar/bar.h @@ -0,0 +1,5 @@ +#include + +#pragma once + +int bar_return_success(void); diff --git a/test cases/vala/11 generated vapi/libbar/meson.build b/test cases/vala/11 generated vapi/libbar/meson.build new file mode 100644 index 0000000..6482504 --- /dev/null +++ b/test cases/vala/11 generated vapi/libbar/meson.build @@ -0,0 +1,33 @@ +libbar_sources = [ + 'bar.c', + 'bar.h', +] + +libbar_deps = [ + dependency('gobject-2.0'), + libfoo_dep, +] + +libbar = shared_library('bar', libbar_sources, + dependencies: libbar_deps, + install: true, +) + +libbar_api_ver = '1.0' + +libbar_gir = gnome.generate_gir(libbar, + sources: libbar_sources, + namespace: 'Bar', + nsversion: libbar_api_ver, + packages: 'gobject-2.0', + symbol_prefix: 'bar', + extra_args: [ + '--c-include=bar.h', + ], +) + +libbar_vapi = gnome.generate_vapi('bar-' + libbar_api_ver, + sources: libbar_gir[0], + packages: libfoo_vapi, + install: true, +) diff --git a/test cases/vala/11 generated vapi/libfoo/foo.c b/test cases/vala/11 generated vapi/libfoo/foo.c new file mode 100644 index 0000000..0413ac5 --- /dev/null +++ b/test cases/vala/11 generated vapi/libfoo/foo.c @@ -0,0 +1,11 @@ +#include "foo.h" + +/** + * foo_return_success: + * + * Returns 0 + */ +int foo_return_success(void) +{ + return 0; +} diff --git a/test cases/vala/11 generated vapi/libfoo/foo.h b/test cases/vala/11 generated vapi/libfoo/foo.h new file mode 100644 index 0000000..f09256d --- /dev/null +++ b/test cases/vala/11 generated vapi/libfoo/foo.h @@ -0,0 +1,5 @@ +#include + +#pragma once + +int foo_return_success(void); diff --git a/test cases/vala/11 generated vapi/libfoo/meson.build b/test cases/vala/11 generated vapi/libfoo/meson.build new file mode 100644 index 0000000..482c8fe --- /dev/null +++ b/test cases/vala/11 generated vapi/libfoo/meson.build @@ -0,0 +1,36 @@ +libfoo_sources = [ + 'foo.c', + 'foo.h', +] + +libfoo_deps = [ + dependency('gobject-2.0') +] + +libfoo = shared_library('foo', libfoo_sources, + dependencies: libfoo_deps, + install: true, +) + +libfoo_api_ver = '1.0' + +libfoo_gir = gnome.generate_gir(libfoo, + sources: libfoo_sources, + namespace: 'Foo', + nsversion: libfoo_api_ver, + packages: 'gobject-2.0', + symbol_prefix: 'foo', + extra_args: [ + '--c-include=foo.h', + ], +) + +libfoo_vapi = gnome.generate_vapi('foo-' + libfoo_api_ver, + sources: libfoo_gir[0], + install: true, +) + +libfoo_dep = declare_dependency( + link_with: libfoo, + include_directories: include_directories('.'), +) diff --git a/test cases/vala/11 generated vapi/main.vala b/test cases/vala/11 generated vapi/main.vala new file mode 100644 index 0000000..303ab33 --- /dev/null +++ b/test cases/vala/11 generated vapi/main.vala @@ -0,0 +1,9 @@ +using Foo; +using Bar; + +class Main : GLib.Object { + public static int main(string[] args) { + var ignore = Foo.return_success(); + return Bar.return_success(); + } +} diff --git a/test cases/vala/11 generated vapi/meson.build b/test cases/vala/11 generated vapi/meson.build new file mode 100644 index 0000000..82f0c44 --- /dev/null +++ b/test cases/vala/11 generated vapi/meson.build @@ -0,0 +1,13 @@ +project('vapi-test', ['c', 'vala']) + +gnome = import('gnome') +subdir('libfoo') +subdir('libbar') + +vapiexe = executable('vapigen-test', + 'main.vala', + dependencies: [dependency('gobject-2.0'), libbar_vapi], + install: true, +) + +test('vapigen-test', vapiexe) diff --git a/test cases/vala/11 mixed sources/c/foo.c b/test cases/vala/11 mixed sources/c/foo.c deleted file mode 100644 index f3c6fb8..0000000 --- a/test cases/vala/11 mixed sources/c/foo.c +++ /dev/null @@ -1,5 +0,0 @@ -int retval (void); - -int test (void) { - return retval (); -} diff --git a/test cases/vala/11 mixed sources/c/meson.build b/test cases/vala/11 mixed sources/c/meson.build deleted file mode 100644 index ead0575..0000000 --- a/test cases/vala/11 mixed sources/c/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -writec = find_program('writec.py') - -retval = custom_target('writec', - output : 'retval.c', - command : [writec, '@OUTPUT@']) diff --git a/test cases/vala/11 mixed sources/c/writec.py b/test cases/vala/11 mixed sources/c/writec.py deleted file mode 100644 index 2cc822b..0000000 --- a/test cases/vala/11 mixed sources/c/writec.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python3 - -import sys - -c = '''int -retval(void) { - return 0; -} -''' - -with open(sys.argv[1], 'w') as f: - f.write(c) diff --git a/test cases/vala/11 mixed sources/meson.build b/test cases/vala/11 mixed sources/meson.build deleted file mode 100644 index 75b8ecd..0000000 --- a/test cases/vala/11 mixed sources/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('foo', 'c', 'vala') - -glib = dependency('glib-2.0') - -subdir('c') -e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib]) -test('test foo', e) diff --git a/test cases/vala/11 mixed sources/vala/bar.vala b/test cases/vala/11 mixed sources/vala/bar.vala deleted file mode 100644 index 10dce1e..0000000 --- a/test cases/vala/11 mixed sources/vala/bar.vala +++ /dev/null @@ -1,5 +0,0 @@ -extern int test (); - -public int main (string[] args) { - return test (); -} diff --git a/test cases/vala/12 custom output/foo.vala b/test cases/vala/12 custom output/foo.vala new file mode 100644 index 0000000..e69de29 diff --git a/test cases/vala/12 custom output/meson.build b/test cases/vala/12 custom output/meson.build new file mode 100644 index 0000000..ef6dbb5 --- /dev/null +++ b/test cases/vala/12 custom output/meson.build @@ -0,0 +1,9 @@ +project('valatest', 'c', 'vala') + +glib = dependency('glib-2.0') +gobject = dependency('gobject-2.0') + +library('foo-1.0', 'foo.vala', + vala_header: 'foo.h', + vala_vapi: 'foo.vapi', + dependencies: [glib, gobject]) diff --git a/test cases/vala/12 generated vapi/installed_files.txt b/test cases/vala/12 generated vapi/installed_files.txt deleted file mode 100644 index 5993d01..0000000 --- a/test cases/vala/12 generated vapi/installed_files.txt +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/vapigen-test -usr/lib/libfoo.so -usr/lib/libbar.so -usr/share/vala/vapi/foo-1.0.vapi -usr/share/vala/vapi/foo-1.0.deps -usr/share/vala/vapi/bar-1.0.vapi -usr/share/vala/vapi/bar-1.0.deps diff --git a/test cases/vala/12 generated vapi/libbar/bar.c b/test cases/vala/12 generated vapi/libbar/bar.c deleted file mode 100644 index f0f5cb8..0000000 --- a/test cases/vala/12 generated vapi/libbar/bar.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "bar.h" -#include "foo.h" - -/** - * bar_return_success: - * - * Returns 0 - */ -int bar_return_success(void) -{ - return foo_return_success(); -} diff --git a/test cases/vala/12 generated vapi/libbar/bar.h b/test cases/vala/12 generated vapi/libbar/bar.h deleted file mode 100644 index 165b104..0000000 --- a/test cases/vala/12 generated vapi/libbar/bar.h +++ /dev/null @@ -1,5 +0,0 @@ -#include - -#pragma once - -int bar_return_success(void); diff --git a/test cases/vala/12 generated vapi/libbar/meson.build b/test cases/vala/12 generated vapi/libbar/meson.build deleted file mode 100644 index 6482504..0000000 --- a/test cases/vala/12 generated vapi/libbar/meson.build +++ /dev/null @@ -1,33 +0,0 @@ -libbar_sources = [ - 'bar.c', - 'bar.h', -] - -libbar_deps = [ - dependency('gobject-2.0'), - libfoo_dep, -] - -libbar = shared_library('bar', libbar_sources, - dependencies: libbar_deps, - install: true, -) - -libbar_api_ver = '1.0' - -libbar_gir = gnome.generate_gir(libbar, - sources: libbar_sources, - namespace: 'Bar', - nsversion: libbar_api_ver, - packages: 'gobject-2.0', - symbol_prefix: 'bar', - extra_args: [ - '--c-include=bar.h', - ], -) - -libbar_vapi = gnome.generate_vapi('bar-' + libbar_api_ver, - sources: libbar_gir[0], - packages: libfoo_vapi, - install: true, -) diff --git a/test cases/vala/12 generated vapi/libfoo/foo.c b/test cases/vala/12 generated vapi/libfoo/foo.c deleted file mode 100644 index 0413ac5..0000000 --- a/test cases/vala/12 generated vapi/libfoo/foo.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "foo.h" - -/** - * foo_return_success: - * - * Returns 0 - */ -int foo_return_success(void) -{ - return 0; -} diff --git a/test cases/vala/12 generated vapi/libfoo/foo.h b/test cases/vala/12 generated vapi/libfoo/foo.h deleted file mode 100644 index f09256d..0000000 --- a/test cases/vala/12 generated vapi/libfoo/foo.h +++ /dev/null @@ -1,5 +0,0 @@ -#include - -#pragma once - -int foo_return_success(void); diff --git a/test cases/vala/12 generated vapi/libfoo/meson.build b/test cases/vala/12 generated vapi/libfoo/meson.build deleted file mode 100644 index 482c8fe..0000000 --- a/test cases/vala/12 generated vapi/libfoo/meson.build +++ /dev/null @@ -1,36 +0,0 @@ -libfoo_sources = [ - 'foo.c', - 'foo.h', -] - -libfoo_deps = [ - dependency('gobject-2.0') -] - -libfoo = shared_library('foo', libfoo_sources, - dependencies: libfoo_deps, - install: true, -) - -libfoo_api_ver = '1.0' - -libfoo_gir = gnome.generate_gir(libfoo, - sources: libfoo_sources, - namespace: 'Foo', - nsversion: libfoo_api_ver, - packages: 'gobject-2.0', - symbol_prefix: 'foo', - extra_args: [ - '--c-include=foo.h', - ], -) - -libfoo_vapi = gnome.generate_vapi('foo-' + libfoo_api_ver, - sources: libfoo_gir[0], - install: true, -) - -libfoo_dep = declare_dependency( - link_with: libfoo, - include_directories: include_directories('.'), -) diff --git a/test cases/vala/12 generated vapi/main.vala b/test cases/vala/12 generated vapi/main.vala deleted file mode 100644 index 303ab33..0000000 --- a/test cases/vala/12 generated vapi/main.vala +++ /dev/null @@ -1,9 +0,0 @@ -using Foo; -using Bar; - -class Main : GLib.Object { - public static int main(string[] args) { - var ignore = Foo.return_success(); - return Bar.return_success(); - } -} diff --git a/test cases/vala/12 generated vapi/meson.build b/test cases/vala/12 generated vapi/meson.build deleted file mode 100644 index 82f0c44..0000000 --- a/test cases/vala/12 generated vapi/meson.build +++ /dev/null @@ -1,13 +0,0 @@ -project('vapi-test', ['c', 'vala']) - -gnome = import('gnome') -subdir('libfoo') -subdir('libbar') - -vapiexe = executable('vapigen-test', - 'main.vala', - dependencies: [dependency('gobject-2.0'), libbar_vapi], - install: true, -) - -test('vapigen-test', vapiexe) diff --git a/test cases/vala/13 custom output/foo.vala b/test cases/vala/13 custom output/foo.vala deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/vala/13 custom output/meson.build b/test cases/vala/13 custom output/meson.build deleted file mode 100644 index ef6dbb5..0000000 --- a/test cases/vala/13 custom output/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('valatest', 'c', 'vala') - -glib = dependency('glib-2.0') -gobject = dependency('gobject-2.0') - -library('foo-1.0', 'foo.vala', - vala_header: 'foo.h', - vala_vapi: 'foo.vapi', - dependencies: [glib, gobject]) diff --git a/test cases/vala/13 find library/meson.build b/test cases/vala/13 find library/meson.build new file mode 100644 index 0000000..03054d2 --- /dev/null +++ b/test cases/vala/13 find library/meson.build @@ -0,0 +1,9 @@ +project('find vala library', 'vala', 'c') + +valac = meson.get_compiler('vala') + +gobject = dependency('gobject-2.0') +zlib = valac.find_library('zlib') + +e = executable('zlibtest', 'test.vala', dependencies : [gobject, zlib]) +test('testzlib', e) diff --git a/test cases/vala/13 find library/test.vala b/test cases/vala/13 find library/test.vala new file mode 100644 index 0000000..b087cfb --- /dev/null +++ b/test cases/vala/13 find library/test.vala @@ -0,0 +1,6 @@ +using ZLib; + +public static int main(string[] args) { + stdout.printf("ZLIB_VERSION is: %s\n", ZLib.VERSION.STRING); + return 0; +} diff --git a/test cases/vala/14 find library/meson.build b/test cases/vala/14 find library/meson.build deleted file mode 100644 index 03054d2..0000000 --- a/test cases/vala/14 find library/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('find vala library', 'vala', 'c') - -valac = meson.get_compiler('vala') - -gobject = dependency('gobject-2.0') -zlib = valac.find_library('zlib') - -e = executable('zlibtest', 'test.vala', dependencies : [gobject, zlib]) -test('testzlib', e) diff --git a/test cases/vala/14 find library/test.vala b/test cases/vala/14 find library/test.vala deleted file mode 100644 index b087cfb..0000000 --- a/test cases/vala/14 find library/test.vala +++ /dev/null @@ -1,6 +0,0 @@ -using ZLib; - -public static int main(string[] args) { - stdout.printf("ZLIB_VERSION is: %s\n", ZLib.VERSION.STRING); - return 0; -} -- cgit v1.1