diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-05-20 20:53:02 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-05-20 21:03:40 +0200 |
commit | 96cc5c9c2aa21d063656773c4ab436655991c302 (patch) | |
tree | 69eacf7c5b5549a67be1c5e9b20c1677cfbb74c9 /tests/fastvapi | |
parent | 82506bd8085b326205fd4ae8b89132dc62f3ab42 (diff) | |
download | vala-96cc5c9c2aa21d063656773c4ab436655991c302.tar.gz |
vala: Strip "basedir" from Source.filename attribute
This is gives some control over the written relative filenames and fixes
make distcheck due of out-of-source-dir building.
Diffstat (limited to 'tests/fastvapi')
-rw-r--r-- | tests/fastvapi/Makefile.am | 1 | ||||
-rw-r--r-- | tests/fastvapi/fastvapitest.vapi-expected | 36 |
2 files changed, 19 insertions, 18 deletions
diff --git a/tests/fastvapi/Makefile.am b/tests/fastvapi/Makefile.am index e58523ba4..b960ac4b1 100644 --- a/tests/fastvapi/Makefile.am +++ b/tests/fastvapi/Makefile.am @@ -5,6 +5,7 @@ check-fastvapi: $(top_builddir)/compiler/valac -C \ --disable-version-header \ --fast-vapi fastvapitest.vapi \ + --basedir $(srcdir) \ $(srcdir)/fastvapitest.vala; \ tail -n +3 fastvapitest.vapi | diff -wu $(srcdir)/fastvapitest.vapi-expected - || exit 1; \ rm -f fastvapitest.vapi fastvapitest.c diff --git a/tests/fastvapi/fastvapitest.vapi-expected b/tests/fastvapi/fastvapitest.vapi-expected index 55540ab08..0542a563d 100644 --- a/tests/fastvapi/fastvapitest.vapi-expected +++ b/tests/fastvapi/fastvapitest.vapi-expected @@ -1,44 +1,44 @@ using GLib; -[Source (filename = "./fastvapitest.vala", line = 1, column = 1)] +[Source (filename = "fastvapitest.vala", line = 1, column = 1)] namespace FastVapi { - [Source (filename = "./fastvapitest.vala", line = 23, column = 2)] + [Source (filename = "fastvapitest.vala", line = 23, column = 2)] public class Test : Object { - [Source (filename = "./fastvapitest.vala", line = 26, column = 3)] + [Source (filename = "fastvapitest.vala", line = 26, column = 3)] public int field; - [Source (filename = "./fastvapitest.vala", line = 30, column = 3)] + [Source (filename = "fastvapitest.vala", line = 30, column = 3)] public Test (); - [Source (filename = "./fastvapitest.vala", line = 33, column = 3)] + [Source (filename = "fastvapitest.vala", line = 33, column = 3)] public void method (); - [Source (filename = "./fastvapitest.vala", line = 28, column = 3)] + [Source (filename = "fastvapitest.vala", line = 28, column = 3)] public string property { get; set construct; } - [Source (filename = "./fastvapitest.vala", line = 24, column = 3)] + [Source (filename = "fastvapitest.vala", line = 24, column = 3)] public signal void some_signal (int param); } - [Source (filename = "./fastvapitest.vala", line = 16, column = 2)] + [Source (filename = "fastvapitest.vala", line = 16, column = 2)] public interface InterfaceTest : Object { - [Source (filename = "./fastvapitest.vala", line = 18, column = 3)] + [Source (filename = "fastvapitest.vala", line = 18, column = 3)] public abstract void method (int param); - [Source (filename = "./fastvapitest.vala", line = 17, column = 3)] + [Source (filename = "fastvapitest.vala", line = 17, column = 3)] public abstract int property { get; set construct; } } - [Source (filename = "./fastvapitest.vala", line = 12, column = 2)] + [Source (filename = "fastvapitest.vala", line = 12, column = 2)] public struct TestStruct { - [Source (filename = "./fastvapitest.vala", line = 13, column = 3)] + [Source (filename = "fastvapitest.vala", line = 13, column = 3)] public int field_name; } - [Source (filename = "./fastvapitest.vala", line = 4, column = 2)] + [Source (filename = "fastvapitest.vala", line = 4, column = 2)] public enum EnumTest { - [Source (filename = "./fastvapitest.vala", line = 5, column = 3)] + [Source (filename = "fastvapitest.vala", line = 5, column = 3)] VALUE } - [Source (filename = "./fastvapitest.vala", line = 8, column = 2)] + [Source (filename = "fastvapitest.vala", line = 8, column = 2)] public errordomain ErrorTest { - [Source (filename = "./fastvapitest.vala", line = 9, column = 3)] + [Source (filename = "fastvapitest.vala", line = 9, column = 3)] FAILED } - [Source (filename = "./fastvapitest.vala", line = 21, column = 2)] + [Source (filename = "fastvapitest.vala", line = 21, column = 2)] public delegate bool DelegateTest (int param); - [Source (filename = "./fastvapitest.vala", line = 2, column = 2)] + [Source (filename = "fastvapitest.vala", line = 2, column = 2)] public const int CONSTANT = 42; } |