From 8fdd5dec72dcb58b6db12d417387985ca24f0651 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 14 Oct 2016 15:24:28 +0200 Subject: [PATCH] build: merge "libnm-core/tests/Makefile.am" into toplevel Makefile libnm-core/Makefile.libnm-core still exists, it is used by libnm/Makefile.am. --- Makefile.am | 102 ++++++++++++++++++++++++++++++++++- configure.ac | 2 - libnm-core/Makefile.am | 1 - libnm-core/tests/Makefile.am | 74 ------------------------- 4 files changed, 101 insertions(+), 78 deletions(-) delete mode 100644 libnm-core/Makefile.am delete mode 100644 libnm-core/tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index 811cd5780a..82e23fee89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,19 +2,22 @@ include $(GLIB_MAKEFILE) @GNOME_CODE_COVERAGE_RULES@ +@NM_LOG_COMPILER@ + ############################################################################### AUTOMAKE_OPTIONS = subdir-objects noinst_LTLIBRARIES = +noinst_PROGRAMS = CLEANFILES = EXTRA_DIST = BUILT_SOURCES = GLIB_GENERATED = +TESTS = SUBDIRS = \ . \ - libnm-core \ libnm \ src \ dispatcher \ @@ -439,6 +442,103 @@ BUILT_SOURCES += \ ############################################################################### +if ENABLE_TESTS + +libnm_core_tests_programs = \ + libnm-core/tests/test-compare \ + libnm-core/tests/test-crypto \ + libnm-core/tests/test-general \ + libnm-core/tests/test-keyfile \ + libnm-core/tests/test-secrets \ + libnm-core/tests/test-setting-8021x \ + libnm-core/tests/test-setting-bond \ + libnm-core/tests/test-setting-dcb \ + libnm-core/tests/test-settings-defaults + +noinst_PROGRAMS += $(libnm_core_tests_programs) + +GLIB_GENERATED += \ + libnm-core/tests/nm-core-tests-enum-types.h \ + libnm-core/tests/nm-core-tests-enum-types.c + +nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h +nm_core_tests_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM +nm_core_tests_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM + +libnm_core_tests_cppflags = \ + -I${srcdir}/shared \ + -I${builddir}/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm-core/tests \ + -DNETWORKMANAGER_COMPILATION \ + $(GLIB_CFLAGS) \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + +libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_8021x_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_bond_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_dcb_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) + +libnm_core_tests_test_general_SOURCES = \ + libnm-core/tests/nm-core-tests-enum-types.c \ + libnm-core/tests/nm-core-tests-enum-types.h \ + libnm-core/tests/test-general-enums.h \ + libnm-core/tests/test-general.c + +libnm_core_tests_ldadd = \ + libnm-core/libnm-core.la \ + $(GLIB_LIBS) + +libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_8021x_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_bond_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_dcb_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) + +TESTS += $(libnm_core_tests_programs) + +endif + +# test-cert.p12 created with: +# +# openssl pkcs12 -export \ +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 + +EXTRA_DIST += \ + libnm-core/tests/certs/ca-no-ending-newline.pem \ + libnm-core/tests/certs/pkcs8-decrypted.der \ + libnm-core/tests/certs/pkcs8-enc-key.pem \ + libnm-core/tests/certs/pkcs8-noenc-key.pem \ + libnm-core/tests/certs/test2_ca_cert.pem \ + libnm-core/tests/certs/test2-cert.p12 \ + libnm-core/tests/certs/test2_key_and_cert.pem \ + libnm-core/tests/certs/test-aes-key.pem \ + libnm-core/tests/certs/test_ca_cert.der \ + libnm-core/tests/certs/test_ca_cert.pem \ + libnm-core/tests/certs/test-ca-cert.pem \ + libnm-core/tests/certs/test-cert.p12 \ + libnm-core/tests/certs/test_key_and_cert.pem \ + libnm-core/tests/certs/test-key-and-cert.pem \ + libnm-core/tests/certs/test-key-only-decrypted.der \ + libnm-core/tests/certs/test-key-only-decrypted.pem \ + libnm-core/tests/certs/test-key-only.pem + +############################################################################### + EXTRA_DIST += \ CONTRIBUTING \ NetworkManager.pc.in \ diff --git a/configure.ac b/configure.ac index 1aadad9f59..4ed8c3790f 100644 --- a/configure.ac +++ b/configure.ac @@ -1168,8 +1168,6 @@ src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile -libnm-core/Makefile -libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/libnm-core/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am deleted file mode 100644 index 0cc48efab3..0000000000 --- a/libnm-core/tests/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -include $(GLIB_MAKEFILE) - -GLIB_GENERATED = nm-core-tests-enum-types.h nm-core-tests-enum-types.c -nm_core_tests_enum_types_sources = test-general-enums.h -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -BUILT_SOURCES = $(GLIB_GENERATED) - -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION \ - $(GLIB_CFLAGS) \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" - -noinst_PROGRAMS = \ - test-compare \ - test-crypto \ - test-general \ - test-keyfile \ - test-secrets \ - test-setting-8021x \ - test-setting-bond \ - test-setting-dcb \ - test-settings-defaults - -LDADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(GLIB_LIBS) - -@NM_LOG_COMPILER@ -TESTS = $(noinst_PROGRAMS) - -test_general_SOURCES = \ - test-general.c \ - test-general-enums.h \ - nm-core-tests-enum-types.c \ - nm-core-tests-enum-types.h - -endif - -# test-cert.p12 created with: -# -# openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 - -EXTRA_DIST = \ - certs/ca-no-ending-newline.pem \ - certs/pkcs8-decrypted.der \ - certs/pkcs8-enc-key.pem \ - certs/pkcs8-noenc-key.pem \ - certs/test2_ca_cert.pem \ - certs/test2-cert.p12 \ - certs/test2_key_and_cert.pem \ - certs/test-aes-key.pem \ - certs/test_ca_cert.der \ - certs/test_ca_cert.pem \ - certs/test-ca-cert.pem \ - certs/test-cert.p12 \ - certs/test_key_and_cert.pem \ - certs/test-key-and-cert.pem \ - certs/test-key-only-decrypted.der \ - certs/test-key-only-decrypted.pem \ - certs/test-key-only.pem -