system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "src/settings/plugins/keyfile/Makefile.am" into toplevel Makefile

Browse Source
This commit is contained in:
Thomas Haller 2016-10-15 22:28:34 +02:00
parent 48058ff21f
commit 541f543451
7 changed files with 77 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Makefile.am
View File

@ -1578,6 +1578,79 @@ src_ppp_manager_nm_pppd_plugin_la_LIBADD = \
endif
###############################################################################
# src/settings/plugins/keyfile/tests
###############################################################################
if ENABLE_TESTS
noinst_PROGRAMS += src/settings/plugins/keyfile/tests/test-keyfile
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/settings/plugins/keyfile \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DNMCONFDIR=\"nonexistent\"
src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
src/libNetworkManager.la
TESTS += src/settings/plugins/keyfile/tests/test-keyfile
endif
EXTRA_DIST += \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
\
src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
###############################################################################
girdir = $(datadir)/gir-1.0

3
configure.ac
View File

@ -1150,9 +1150,6 @@ src/settings/plugins/ifcfg-rh/tests/Makefile
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
src/settings/plugins/ibft/Makefile
src/settings/plugins/ibft/tests/Makefile
src/settings/plugins/keyfile/Makefile
src/settings/plugins/keyfile/tests/Makefile
src/settings/plugins/keyfile/tests/keyfiles/Makefile
src/platform/Makefile
src/platform/tests/Makefile
src/rdisc/Makefile

2
src/settings/plugins/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS=keyfile
SUBDIRS=
@GNOME_CODE_COVERAGE_RULES@

1
src/settings/plugins/keyfile/Makefile.am
View File

@ -1 +0,0 @@
SUBDIRS = tests

38
src/settings/plugins/keyfile/tests/Makefile.am
View File

@ -1,38 +0,0 @@
if ENABLE_TESTS
SUBDIRS=keyfiles
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
-DNMCONFDIR=\"nonexistent\"
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-keyfile
test_keyfile_SOURCES = \
test-keyfile.c
test_keyfile_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@NM_LOG_COMPILER@
TESTS = test-keyfile
endif

41
src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
View File

@ -1,41 +0,0 @@
KEYFILES = \
Test_Wired_Connection \
Test_GSM_Connection \
Test_Wireless_Connection \
Test_Wired_Connection_MAC_Case \
Test_MAC_Old_Format \
Test_MAC_IB_Old_Format \
Test_Wired_Connection_IP6 \
ATT_Data_Connect_BT \
ATT_Data_Connect_Plain \
Test_String_SSID \
Test_Intlist_SSID \
Test_Intlike_SSID \
Test_Intlike_SSID_2 \
Test_Wired_TLS_Old \
Test_Wired_TLS_New \
Test_Wired_TLS_Blob \
Test_Wired_TLS_Path_Missing \
Test_InfiniBand_Connection \
Test_Bridge_Main \
Test_Bridge_Component \
Test_New_Wired_Group_Name \
Test_New_Wireless_Group_Names \
Test_minimal_1 \
Test_minimal_2 \
Test_minimal_slave_1 \
Test_minimal_slave_2 \
Test_minimal_slave_3 \
Test_minimal_slave_4 \
Test_Missing_Vlan_Setting \
Test_Missing_Vlan_Flags \
Test_Missing_ID_UUID \
Test_Enum_Property \
Test_Flags_Property
CERTS = \
test-ca-cert.pem \
test-key-and-cert.pem
EXTRA_DIST = $(KEYFILES) $(CERTS)

3
src/settings/plugins/keyfile/tests/test-keyfile.c
View File

@ -2579,6 +2579,9 @@ int main (int argc, char **argv)
_nm_utils_set_testing (NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK);
nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
if (g_mkdir_with_parents (TEST_SCRATCH_DIR, 0755) != 0)
g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR, g_strerror (errno));
/* The tests */
g_test_add_func ("/keyfile/test_read_valid_wired_connection", test_read_valid_wired_connection);
g_test_add_func ("/keyfile/test_write_wired_connection", test_write_wired_connection);