From 541f543451a10748ad5e8eab2c38b6aed4b52ce7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 15 Oct 2016 22:28:34 +0200 Subject: [PATCH] build: merge "src/settings/plugins/keyfile/Makefile.am" into toplevel Makefile --- Makefile.am | 73 +++++++++++++++++++ configure.ac | 3 - src/settings/plugins/Makefile.am | 2 +- src/settings/plugins/keyfile/Makefile.am | 1 - .../plugins/keyfile/tests/Makefile.am | 38 ---------- .../keyfile/tests/keyfiles/Makefile.am | 41 ----------- .../plugins/keyfile/tests/test-keyfile.c | 3 + 7 files changed, 77 insertions(+), 84 deletions(-) delete mode 100644 src/settings/plugins/keyfile/Makefile.am delete mode 100644 src/settings/plugins/keyfile/tests/Makefile.am delete mode 100644 src/settings/plugins/keyfile/tests/keyfiles/Makefile.am diff --git a/Makefile.am b/Makefile.am index eff09f66aa..c51c94a34b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 210173e0f8..a39d85a12f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am index 278d455d3a..ab118fd9f4 100644 --- a/src/settings/plugins/Makefile.am +++ b/src/settings/plugins/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=keyfile +SUBDIRS= @GNOME_CODE_COVERAGE_RULES@ diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/settings/plugins/keyfile/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am deleted file mode 100644 index b8f241cc9a..0000000000 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ /dev/null @@ -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 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am deleted file mode 100644 index 9d652fd218..0000000000 --- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am +++ /dev/null @@ -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) - diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index 21dc0c13fc..68a4ba1532 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -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);