clients/tests: rename clients/common's "test-general" to "test-clients-common"

This commit is contained in:
Thomas Haller 2019-05-19 13:54:17 +02:00
parent c99bbc99b0
commit 0c7bc1a5d9
4 changed files with 13 additions and 10 deletions

3
.gitignore vendored
View file

@ -63,7 +63,7 @@ test-*.trs
/clients/cli/nmcli
/clients/common/settings-docs.h
/clients/common/tests/test-general
/clients/common/tests/test-clients-common
/clients/common/tests/test-libnm-core-aux
/clients/nm-online
/clients/tui/newt/libnmt-newt.a
@ -249,6 +249,7 @@ test-*.trs
/callouts/tests/test-dispatcher-envp
/clients/cli/settings-docs.c
/clients/common/settings-docs.c
/clients/common/tests/test-general
/docs/libnm-glib/*.stamp
/docs/libnm-glib/html/
/docs/libnm-glib/libnm-glib-*.txt

View file

@ -4085,29 +4085,29 @@ $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
if HAVE_INTROSPECTION
check_programs += clients/common/tests/test-general
check_programs += clients/common/tests/test-clients-common
else
if BUILD_NMCLI
check_programs += clients/common/tests/test-general
check_programs += clients/common/tests/test-clients-common
endif
endif
clients_common_tests_test_general_CPPFLAGS = \
clients_common_tests_test_clients_common_CPPFLAGS = \
-I$(srcdir)/clients/common/tests \
$(clients_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
$(NULL)
clients_common_tests_test_general_LDFLAGS = \
clients_common_tests_test_clients_common_LDFLAGS = \
$(SANITIZER_EXEC_LDFLAGS)
clients_common_tests_test_general_LDADD = \
clients_common_tests_test_clients_common_LDADD = \
libnm/libnm.la \
clients/common/libnmc-base.la \
clients/common/libnmc.la \
$(GLIB_LIBS)
$(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
###############################################################################

View file

@ -1,7 +1,9 @@
test_name = 'test-clients-common'
exe = executable(
'clients-test-general',
'test-general.c',
test_name,
test_name + '.c',
dependencies: [
libnm_dep,
libnmc_dep,
@ -14,7 +16,7 @@ exe = executable(
)
test(
'clients/common/tests/test-general',
test_name,
test_script,
args: test_args + [exe.full_path()],
)