diff options
| author | Michael Biebl <biebl@debian.org> | 2019-07-31 10:51:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-07-31 10:51:42 +0200 |
| commit | 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (patch) | |
| tree | 86f69d36c56de3074280456eddc854a780b8e04b /libnm/tests | |
| parent | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff) | |
New upstream version 1.19.90 upstream/1.19.90
Diffstat (limited to 'libnm/tests')
| -rw-r--r-- | libnm/tests/meson.build | 22 | ||||
| -rw-r--r-- | libnm/tests/test-libnm.c (renamed from libnm/tests/test-general.c) | 1 | ||||
| -rw-r--r-- | libnm/tests/test-nm-client.c | 1 | ||||
| -rw-r--r-- | libnm/tests/test-remote-settings-client.c | 1 | ||||
| -rw-r--r-- | libnm/tests/test-secret-agent.c | 1 |
5 files changed, 12 insertions, 14 deletions
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index d76b9f5f..5b72a24f 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -1,8 +1,8 @@ test_units = [ - ['test-general', [libnm_utils, libnm_core], 30], - ['test-nm-client', [], 90], - ['test-remote-settings-client', [], 90], - ['test-secret-agent', [], 90], + ['test-libnm', 30], + ['test-nm-client', 90], + ['test-remote-settings-client', 90], + ['test-secret-agent', 90], ] cflags = [ @@ -12,24 +12,26 @@ cflags = [ foreach test_unit: test_units exe = executable( - 'libnm-' + test_unit[0], + test_unit[0], [ test_unit[0] + '.c', shared_nm_test_utils_impl_c, ], dependencies: [ - libnm_dep, - libnm_core_dep, + liblibnm_dep, libnm_systemd_shared_no_logging_dep, ], c_args: cflags, - link_with: test_unit[1], + link_with: [ + liblibnm, + libnm_core, + ], ) test( - 'libnm/' + test_unit[0], + test_unit[0], test_script, - timeout: test_unit[2], + timeout: test_unit[1], args: test_args + [exe.full_path()], ) endforeach diff --git a/libnm/tests/test-general.c b/libnm/tests/test-libnm.c index 410087af..2a64fad8 100644 --- a/libnm/tests/test-general.c +++ b/libnm/tests/test-libnm.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* * * This program is free software; you can redistribute it and/or modify diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 35ae33be..44cd5b3b 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 1b211494..45bf97c8 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 35a215ca..cc060440 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |