diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-18 11:28:26 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-18 11:37:47 +0200 |
| commit | 041aa3d60576dd30fe52e1b01c88b079ec827f66 (patch) | |
| tree | a50c35cd3f1170e7b752992ab650a6aa74cf63c6 /src/platform/tests | |
| parent | 5e11d4bf1fb9360f8e612a51dd03cb54cd8153fc (diff) | |
| download | NetworkManager-041aa3d60576dd30fe52e1b01c88b079ec827f66.tar.gz | |
platform/tests: rename platform's "test-general.c"
Older versions of meson don't like building multiple artifacts
with the same name (even if they are in different directories). We
have multiple tests called "test-general.c", and it would be natural
to compile a test binary of the same name.
Meson encountered an error in file src/tests/meson.build, line 14, column 2:
Tried to create target "test-general", but a target of that name already exists.
It's generally a bad idea to have in our source tree multiple files with the
same name. Rename the test.
Fixes: 16cd84d346f1 ('build/meson: rename platform tests to use same name as autotools'):
Diffstat (limited to 'src/platform/tests')
| -rw-r--r-- | src/platform/tests/.gitignore | 6 | ||||
| -rw-r--r-- | src/platform/tests/meson.build | 20 | ||||
| -rw-r--r-- | src/platform/tests/test-platform-general.c (renamed from src/platform/tests/test-general.c) | 0 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/platform/tests/.gitignore b/src/platform/tests/.gitignore index 536f012fbd..7ebc980c2f 100644 --- a/src/platform/tests/.gitignore +++ b/src/platform/tests/.gitignore @@ -1,14 +1,16 @@ -/dump /monitor /platform /test-address-fake /test-address-linux /test-cleanup-fake /test-cleanup-linux -/test-general /test-link-fake /test-link-linux /test-nmp-object +/test-platform-general /test-route-fake /test-route-linux +# no longer exists but was used in the past. +/dump +/test-general diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build index b3a9616286..aaee8964eb 100644 --- a/src/platform/tests/meson.build +++ b/src/platform/tests/meson.build @@ -1,14 +1,14 @@ test_units = [ - ['test-link-fake', 'test-link.c', test_nm_dep_fake, default_test_timeout], - ['test-link-linux', 'test-link.c', test_nm_dep_linux, 900], - ['test-address-fake', 'test-address.c', test_nm_dep_fake, default_test_timeout], - ['test-address-linux', 'test-address.c', test_nm_dep_linux, default_test_timeout], - ['test-general', 'test-general.c', test_nm_dep, default_test_timeout], - ['test-nmp-object', 'test-nmp-object.c', test_nm_dep, default_test_timeout], - ['test-route-fake', 'test-route.c', test_nm_dep_fake, default_test_timeout], - ['test-route-linux', 'test-route.c', test_nm_dep_linux, default_test_timeout], - ['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, default_test_timeout], - ['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, default_test_timeout], + [ 'test-address-fake', 'test-address.c', test_nm_dep_fake, default_test_timeout ], + [ 'test-address-linux', 'test-address.c', test_nm_dep_linux, default_test_timeout ], + [ 'test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, default_test_timeout ], + [ 'test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, default_test_timeout ], + [ 'test-link-fake', 'test-link.c', test_nm_dep_fake, default_test_timeout ], + [ 'test-link-linux', 'test-link.c', test_nm_dep_linux, 900 ], + [ 'test-nmp-object', 'test-nmp-object.c', test_nm_dep, default_test_timeout ], + [ 'test-platform-general', 'test-platform-general.c', test_nm_dep, default_test_timeout ], + [ 'test-route-fake', 'test-route.c', test_nm_dep_fake, default_test_timeout ], + [ 'test-route-linux', 'test-route.c', test_nm_dep_linux, default_test_timeout ], ] foreach test_unit: test_units diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-platform-general.c index eebc15d80d..eebc15d80d 100644 --- a/src/platform/tests/test-general.c +++ b/src/platform/tests/test-platform-general.c |