diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2021-09-17 17:22:00 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2021-09-20 13:27:15 +0200 |
| commit | c896973debc4e7ec63e35b9e0bbefc083c5b9d27 (patch) | |
| tree | 8fa3165a232876b4f7659e3812521b5bf0af120f | |
| parent | e0691f9528296b28bd455a177bdf90f9ab457c8a (diff) | |
| download | NetworkManager-c896973debc4e7ec63e35b9e0bbefc083c5b9d27.tar.gz | |
platform: drop test-tc-fake
It doesn't seem useful to have a copy of the test which does nothing.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/core/platform/tests/meson.build | 1 | ||||
| -rw-r--r-- | src/core/platform/tests/test-tc.c | 12 |
3 files changed, 5 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 22634626d0..05406d674e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4180,7 +4180,6 @@ check_programs += \ src/core/platform/tests/test-platform-general \ src/core/platform/tests/test-route-fake \ src/core/platform/tests/test-route-linux \ - src/core/platform/tests/test-tc-fake \ src/core/platform/tests/test-tc-linux \ $(NULL) @@ -4236,11 +4235,6 @@ src_core_platform_tests_test_route_linux_CPPFLAGS = $(src_core_tests_cppflags_li src_core_platform_tests_test_route_linux_LDFLAGS = $(src_core_platform_tests_ldflags) src_core_platform_tests_test_route_linux_LDADD = $(src_core_platform_tests_libadd) -src_core_platform_tests_test_tc_fake_SOURCES = src/core/platform/tests/test-tc.c -src_core_platform_tests_test_tc_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) -src_core_platform_tests_test_tc_fake_LDFLAGS = $(src_core_platform_tests_ldflags) -src_core_platform_tests_test_tc_fake_LDADD = $(src_core_platform_tests_libadd) - src_core_platform_tests_test_tc_linux_SOURCES = src/core/platform/tests/test-tc.c src_core_platform_tests_test_tc_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) src_core_platform_tests_test_tc_linux_LDFLAGS = $(src_core_platform_tests_ldflags) diff --git a/src/core/platform/tests/meson.build b/src/core/platform/tests/meson.build index 5d55707a08..8824ed2f67 100644 --- a/src/core/platform/tests/meson.build +++ b/src/core/platform/tests/meson.build @@ -14,7 +14,6 @@ test_units = [ ['test-platform-general', 'test-platform-general.c', test_c_flags, default_test_timeout], ['test-route-fake', 'test-route.c', test_fake_c_flags, default_test_timeout], ['test-route-linux', 'test-route.c', test_linux_c_flags, default_test_timeout], - ['test-tc-fake', 'test-tc.c', test_fake_c_flags, default_test_timeout], ['test-tc-linux', 'test-tc.c', test_linux_c_flags, default_test_timeout], ] diff --git a/src/core/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c index ddac2642b3..8b7e4d4a94 100644 --- a/src/core/platform/tests/test-tc.c +++ b/src/core/platform/tests/test-tc.c @@ -202,7 +202,7 @@ test_qdisc_tbf(void) /*****************************************************************************/ -NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; void _nmtstp_init_tests(int *argc, char ***argv) @@ -213,10 +213,8 @@ _nmtstp_init_tests(int *argc, char ***argv) void _nmtstp_setup_tests(void) { - if (nmtstp_is_root_test()) { - nmtstp_env1_add_test_func("/link/qdisc/1", test_qdisc1, TRUE); - nmtstp_env1_add_test_func("/link/qdisc/fq_codel", test_qdisc_fq_codel, TRUE); - nmtstp_env1_add_test_func("/link/qdisc/sfq", test_qdisc_sfq, TRUE); - nmtstp_env1_add_test_func("/link/qdisc/tbf", test_qdisc_tbf, TRUE); - } + nmtstp_env1_add_test_func("/link/qdisc/1", test_qdisc1, TRUE); + nmtstp_env1_add_test_func("/link/qdisc/fq_codel", test_qdisc_fq_codel, TRUE); + nmtstp_env1_add_test_func("/link/qdisc/sfq", test_qdisc_sfq, TRUE); + nmtstp_env1_add_test_func("/link/qdisc/tbf", test_qdisc_tbf, TRUE); } |