diff options
| author | Alistair Thomas <astavale@yahoo.co.uk> | 2017-10-03 13:17:58 +0100 |
|---|---|---|
| committer | Corentin Noël <corentin@elementary.io> | 2017-10-03 20:43:02 +0200 |
| commit | 6483a0d8466635ae01373bb469fa98ec44c212e9 (patch) | |
| tree | 57bace0bd50cf0ad80e87f4f37396e6b2741e45e | |
| parent | 1320a98a33e4e9f188e5daa143316b24d0dce819 (diff) | |
| download | meson-6483a0d8466635ae01373bb469fa98ec44c212e9.zip meson-6483a0d8466635ae01373bb469fa98ec44c212e9.tar.gz meson-6483a0d8466635ae01373bb469fa98ec44c212e9.tar.bz2 | |
Add additional directory depth tests to Vala test case 22
6 files changed, 22 insertions, 11 deletions
diff --git a/test cases/vala/22 same target in directories/Subdir/Subdir2/Test.vala b/test cases/vala/22 same target in directories/Subdir/Subdir2/Test.vala new file mode 100644 index 0000000..94e5cbc --- /dev/null +++ b/test cases/vala/22 same target in directories/Subdir/Subdir2/Test.vala @@ -0,0 +1,5 @@ +public class Subdir.Subdir2.Test : GLib.Object { + construct { + stdout.printf("Test from Subdir/Subdir2/\n"); + } +} diff --git a/test cases/vala/22 same target in directories/Subdir/Test.vala b/test cases/vala/22 same target in directories/Subdir/Test.vala index 3a311f4..02143c4 100644 --- a/test cases/vala/22 same target in directories/Subdir/Test.vala +++ b/test cases/vala/22 same target in directories/Subdir/Test.vala @@ -1,5 +1,5 @@ public class Subdir.Test : GLib.Object { construct { - stdout.printf("Test from subdir.\n"); + stdout.printf("Test from Subdir/\n"); } } diff --git a/test cases/vala/22 same target in directories/Subdir2/Test.vala b/test cases/vala/22 same target in directories/Subdir2/Test.vala new file mode 100644 index 0000000..4a2d61f --- /dev/null +++ b/test cases/vala/22 same target in directories/Subdir2/Test.vala @@ -0,0 +1,5 @@ +public class Subdir2.Test : GLib.Object { + construct { + stdout.printf("Test from Subdir2/\n"); + } +} diff --git a/test cases/vala/22 same target in directories/Test.vala b/test cases/vala/22 same target in directories/Test.vala index 1b57dd9..9154e22 100644 --- a/test cases/vala/22 same target in directories/Test.vala +++ b/test cases/vala/22 same target in directories/Test.vala @@ -1,5 +1,5 @@ public class Test : GLib.Object { construct { - stdout.printf("Test from main directory.\n"); + stdout.printf("Test from main directory\n"); } } diff --git a/test cases/vala/22 same target in directories/meson.build b/test cases/vala/22 same target in directories/meson.build index 144e310..6785f73 100644 --- a/test cases/vala/22 same target in directories/meson.build +++ b/test cases/vala/22 same target in directories/meson.build @@ -4,7 +4,9 @@ valadeps = [dependency('glib-2.0'), dependency('gobject-2.0')] valafiles = files( 'prog.vala', 'Test.vala', - 'Subdir/Test.vala' + 'Subdir/Test.vala', + 'Subdir/Subdir2/Test.vala', + 'Subdir2/Test.vala', ) e = executable('multidir_prog', valafiles, dependencies : valadeps) diff --git a/test cases/vala/22 same target in directories/prog.vala b/test cases/vala/22 same target in directories/prog.vala index f3ac099..37cbf7a 100644 --- a/test cases/vala/22 same target in directories/prog.vala +++ b/test cases/vala/22 same target in directories/prog.vala @@ -1,9 +1,8 @@ -class MainProg : GLib.Object { - - public static int main(string[] args) { - var test1 = new Test (); - var test2 = new Subdir.Test (); - stdout.printf("Vala is working.\n"); - return 0; - } +int main() { + var test1 = new Test (); + var test2 = new Subdir.Test (); + var test3 = new Subdir2.Test (); + var test4 = new Subdir.Subdir2.Test (); + stdout.printf("Vala is working.\n"); + return 0; } |