diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-13 01:53:41 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-08-14 22:47:34 -0400 |
| commit | c09586462cbf36477a505dd3cdaa7a80da17dbbd (patch) | |
| tree | 8cfdccacb81a9e7e035cb67f158b99564ff21528 | |
| parent | 48580ac8a322bb760fc00e6d74dde63225f3ee0a (diff) | |
| download | meson-c09586462cbf36477a505dd3cdaa7a80da17dbbd.zip meson-c09586462cbf36477a505dd3cdaa7a80da17dbbd.tar.gz meson-c09586462cbf36477a505dd3cdaa7a80da17dbbd.tar.bz2 | |
Add variables to test to prove linkage is correct.
7 files changed, 22 insertions, 3 deletions
diff --git a/test cases/common/160 duplicate source names/dir1/file.c b/test cases/common/160 duplicate source names/dir1/file.c index 76e8197..094e187 100644 --- a/test cases/common/160 duplicate source names/dir1/file.c +++ b/test cases/common/160 duplicate source names/dir1/file.c @@ -1 +1,16 @@ -int main() { return 0; } +extern int dir2; +extern int dir2_dir1; +extern int dir3; +extern int dir3_dir1; + +int main() { + if (dir2 != 20) + return 1; + if (dir2_dir1 != 21) + return 1; + if (dir3 != 30) + return 1; + if (dir3_dir1 != 31) + return 1; + return 0; +} diff --git a/test cases/common/160 duplicate source names/dir2/dir1/file.c b/test cases/common/160 duplicate source names/dir2/dir1/file.c index e69de29..5aac8e5 100644 --- a/test cases/common/160 duplicate source names/dir2/dir1/file.c +++ b/test cases/common/160 duplicate source names/dir2/dir1/file.c @@ -0,0 +1 @@ +int dir2_dir1 = 21; diff --git a/test cases/common/160 duplicate source names/dir2/file.c b/test cases/common/160 duplicate source names/dir2/file.c index e69de29..6cf8d66 100644 --- a/test cases/common/160 duplicate source names/dir2/file.c +++ b/test cases/common/160 duplicate source names/dir2/file.c @@ -0,0 +1 @@ +int dir2 = 20; diff --git a/test cases/common/160 duplicate source names/dir3/dir1/file.c b/test cases/common/160 duplicate source names/dir3/dir1/file.c index e69de29..04667c2 100644 --- a/test cases/common/160 duplicate source names/dir3/dir1/file.c +++ b/test cases/common/160 duplicate source names/dir3/dir1/file.c @@ -0,0 +1 @@ +int dir3_dir1 = 31; diff --git a/test cases/common/160 duplicate source names/dir3/file.c b/test cases/common/160 duplicate source names/dir3/file.c index e69de29..d16d0a8 100644 --- a/test cases/common/160 duplicate source names/dir3/file.c +++ b/test cases/common/160 duplicate source names/dir3/file.c @@ -0,0 +1 @@ +int dir3 = 30; diff --git a/test cases/common/160 duplicate source names/dir3/meson.build b/test cases/common/160 duplicate source names/dir3/meson.build index 08a2b9c..70ddbf2 100644 --- a/test cases/common/160 duplicate source names/dir3/meson.build +++ b/test cases/common/160 duplicate source names/dir3/meson.build @@ -1 +1 @@ -lib = static_library('empty', 'file.c', 'dir1/file.c') +lib = static_library('lib', 'file.c', 'dir1/file.c') diff --git a/test cases/common/160 duplicate source names/meson.build b/test cases/common/160 duplicate source names/meson.build index 30d7ad0..cac5194 100644 --- a/test cases/common/160 duplicate source names/meson.build +++ b/test cases/common/160 duplicate source names/meson.build @@ -4,4 +4,4 @@ sources = [] subdir('dir1') subdir('dir2') subdir('dir3') -executable('a.out', sources : sources, objects : lib.extract_objects()) +executable('a.out', sources : sources, objects : lib.extract_all_objects()) |