aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchitranjali <chitranjali189@gmail.com>2018-03-29 14:43:56 +0530
committerchitranjali <chitranjali189@gmail.com>2018-03-29 14:43:56 +0530
commitcc6be2e43d403f240f8e9bb1f0b80825124b71cf (patch)
treeb22cdd5ceb2b604ab4c07c212e305d48cfa500fe
parent34cb503c854e9afe2f3e13e9d4a5788c47b830a9 (diff)
downloadmeson-cc6be2e43d403f240f8e9bb1f0b80825124b71cf.zip
meson-cc6be2e43d403f240f8e9bb1f0b80825124b71cf.tar.gz
meson-cc6be2e43d403f240f8e9bb1f0b80825124b71cf.tar.bz2
Fixing flake8
-rw-r--r--mesonbuild/build.py2
-rwxr-xr-xrun_unittests.py4
-rw-r--r--test cases/unit/25 shared_mod linking/meson.build5
-rw-r--r--test cases/unit/26 shared_mod linking/libfile.c (renamed from test cases/unit/25 shared_mod linking/libfile.c)0
-rw-r--r--test cases/unit/26 shared_mod linking/main.c (renamed from test cases/unit/25 shared_mod linking/main.c)0
-rw-r--r--test cases/unit/26 shared_mod linking/meson.build5
6 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index d6b737e..aca592e 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1034,7 +1034,7 @@ You probably should put it in link_with instead.''')
'''
for link_target in self.link_targets:
if isinstance(link_target, SharedModule):
- mlog.warning('''target links against shared modules. This is not
+ mlog.warning('''target links against shared modules. This is not
recommended as it can lead to undefined behaviour on some platforms''')
return
diff --git a/run_unittests.py b/run_unittests.py
index cf60c11..a34d961 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1901,9 +1901,9 @@ int main(int argc, char **argv) {
"""
Test that shared modules are not linked with targets(link_with:) #2865
"""
- tdir = os.path.join(self.unit_test_dir, '25 shared_mod linking')
+ tdir = os.path.join(self.unit_test_dir, '26 shared_mod linking')
out = self.init(tdir)
- msg = ('''WARNING: target links against shared modules. This is not
+ msg = ('''WARNING: target links against shared modules. This is not
recommended as it can lead to undefined behaviour on some platforms''')
self.assertIn(msg, out)
diff --git a/test cases/unit/25 shared_mod linking/meson.build b/test cases/unit/25 shared_mod linking/meson.build
deleted file mode 100644
index 2df16fc..0000000
--- a/test cases/unit/25 shared_mod linking/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-project('shared library linking test', 'c', 'cpp')
-
-lib = shared_module('mylib', 'libfile.c')
-
-exe = executable('prog', 'main.c', link_with : lib, install : true) \ No newline at end of file
diff --git a/test cases/unit/25 shared_mod linking/libfile.c b/test cases/unit/26 shared_mod linking/libfile.c
index 44f7667..44f7667 100644
--- a/test cases/unit/25 shared_mod linking/libfile.c
+++ b/test cases/unit/26 shared_mod linking/libfile.c
diff --git a/test cases/unit/25 shared_mod linking/main.c b/test cases/unit/26 shared_mod linking/main.c
index 12f9c98..12f9c98 100644
--- a/test cases/unit/25 shared_mod linking/main.c
+++ b/test cases/unit/26 shared_mod linking/main.c
diff --git a/test cases/unit/26 shared_mod linking/meson.build b/test cases/unit/26 shared_mod linking/meson.build
new file mode 100644
index 0000000..994a5d3
--- /dev/null
+++ b/test cases/unit/26 shared_mod linking/meson.build
@@ -0,0 +1,5 @@
+project('shared library linking test', 'c', 'cpp')
+
+mod = shared_module('mymod', 'libfile.c')
+
+exe = executable('prog', 'main.c', link_with : mod, install : true) \ No newline at end of file