From 214d96a3f10ef27da28c0977977961611b6b441f Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Jul 07 2016 08:24:35 +0000 Subject: BUILD: Temporarily disable unit and integration tests until we fix them to cope with qualified names in sysdb Many tests use and rely on non-qualified usernames. To avoid huge commits, we will fix them one-by-one. To avoid test failures in the branch, disable all the tests first. Reviewed-by: Sumit Bose --- diff --git a/Makefile.am b/Makefile.am index 6224347..b4a895c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -184,7 +184,7 @@ endif if HAVE_CHECK non_interactive_check_based_tests = \ dlopen-tests \ - sysdb-tests \ + #sysdb-tests \ strtonum-tests \ resolv-tests \ krb5-utils-tests \ @@ -196,7 +196,7 @@ if HAVE_CHECK auth-tests \ ipa_ldap_opt-tests \ ad_ldap_opt-tests \ - simple_access-tests \ + #simple_access-tests \ crypto-tests \ util-tests \ debug-tests \ @@ -225,7 +225,7 @@ endif # HAVE_CHECK if HAVE_CMOCKA non_interactive_cmocka_based_tests = \ - nss-srv-tests \ + #nss-srv-tests \ test-find-uid \ test-io \ test-negcache \ @@ -233,7 +233,7 @@ if HAVE_CMOCKA sss_nss_idmap-tests \ dyndns-tests \ fqnames-tests \ - nestedgroups-tests \ + #nestedgroups-tests \ test_sss_idmap \ test_ipa_idmap \ test_utils \ @@ -245,7 +245,7 @@ if HAVE_CMOCKA test_ldap_auth \ test_sdap_access \ sdap-tests \ - test_sysdb_views \ + #test_sysdb_views \ test_sysdb_ts_cache \ test_sysdb_subdomains \ test_sysdb_sudo \ @@ -257,12 +257,12 @@ if HAVE_CMOCKA responder_cache_req-tests \ test_sbus_opath \ test_fo_srv \ - pam-srv-tests \ + #pam-srv-tests \ test_ipa_subdom_util \ test_tools_colondb \ test_krb5_wait_queue \ test_cert_utils \ - test_ldap_id_cleanup \ + #test_ldap_id_cleanup \ test_data_provider_be \ test_dp_request_table \ test_dp_request \ @@ -1695,18 +1695,18 @@ dlopen_tests_LDADD = \ $(LIBADD_DL) \ $(CHECK_LIBS) -EXTRA_sysdb_tests_DEPENDENCIES = \ - $(ldblib_LTLIBRARIES) -sysdb_tests_SOURCES = \ - src/tests/sysdb-tests.c -sysdb_tests_CFLAGS = \ - $(AM_CFLAGS) \ - $(CHECK_CFLAGS) -sysdb_tests_LDADD = \ - $(SSSD_LIBS) \ - $(CHECK_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_test_common.la +#EXTRA_sysdb_tests_DEPENDENCIES = \ +# $(ldblib_LTLIBRARIES) +#sysdb_tests_SOURCES = \ +# src/tests/sysdb-tests.c +#sysdb_tests_CFLAGS = \ +# $(AM_CFLAGS) \ +# $(CHECK_CFLAGS) +#sysdb_tests_LDADD = \ +# $(SSSD_LIBS) \ +# $(CHECK_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# libsss_test_common.la EXTRA_sysdb_ssh_tests_DEPENDENCIES = \ $(ldblib_LTLIBRARIES) @@ -1904,23 +1904,23 @@ ad_ldap_opt_tests_LDADD = \ $(TALLOC_LIBS) \ libsss_test_common.la -simple_access_tests_SOURCES = \ - src/tests/simple_access-tests.c \ - src/providers/simple/simple_access.c \ - src/providers/simple/simple_access_check.c \ - $(NULL) -simple_access_tests_CFLAGS = \ - $(AM_CFLAGS) \ - $(CHECK_CFLAGS) \ - -DUNIT_TESTING -simple_access_tests_LDADD = \ - $(LIBADD_DL) \ - $(CHECK_LIBS) \ - $(SSSD_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_test_common.la \ - libdlopen_test_providers.la \ - $(NULL) +#simple_access_tests_SOURCES = \ +# src/tests/simple_access-tests.c \ +# src/providers/simple/simple_access.c \ +# src/providers/simple/simple_access_check.c \ +# $(NULL) +#simple_access_tests_CFLAGS = \ +# $(AM_CFLAGS) \ +# $(CHECK_CFLAGS) \ +# -DUNIT_TESTING +#simple_access_tests_LDADD = \ +# $(LIBADD_DL) \ +# $(CHECK_LIBS) \ +# $(SSSD_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# libsss_test_common.la \ +# libdlopen_test_providers.la \ +# $(NULL) util_tests_SOURCES = \ src/tests/util-tests.c \ @@ -2116,68 +2116,68 @@ TEST_MOCK_PROVIDER_OBJ = \ src/tests/cmocka/common_mock_sdap.c \ src/tests/cmocka/common_mock_sysdb_objects.c -EXTRA_nss_srv_tests_DEPENDENCIES = \ - $(ldblib_LTLIBRARIES) -nss_srv_tests_SOURCES = \ - $(TEST_MOCK_RESP_OBJ) \ - src/tests/cmocka/test_nss_srv.c \ - src/responder/nss/nsssrv_cmd.c \ - src/responder/nss/nsssrv_netgroup.c \ - src/responder/nss/nsssrv_services.c \ - src/responder/nss/nsssrv_mmap_cache.c -nss_srv_tests_CFLAGS = \ - $(AM_CFLAGS) -nss_srv_tests_LDFLAGS = \ - -Wl,-wrap,sss_ncache_check_user \ - -Wl,-wrap,sss_ncache_check_uid \ - -Wl,-wrap,sss_ncache_check_sid \ - -Wl,-wrap,sss_ncache_check_cert \ - -Wl,-wrap,sss_packet_get_body \ - -Wl,-wrap,sss_packet_get_cmd \ - -Wl,-wrap,sss_cmd_send_empty \ - -Wl,-wrap,sss_cmd_done -nss_srv_tests_LDADD = \ - $(CMOCKA_LIBS) \ - $(SSSD_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ - libsss_test_common.la \ - libsss_cert.la \ - libsss_idmap.la - -EXTRA_pam_srv_tests_DEPENDENCIES = \ - $(ldblib_LTLIBRARIES) \ - $(NULL) -pam_srv_tests_SOURCES = \ - $(TEST_MOCK_RESP_OBJ) \ - src/tests/cmocka/test_pam_srv.c \ - src/sss_client/pam_message.c \ - src/responder/pam/pamsrv_cmd.c \ - src/responder/pam/pamsrv_p11.c \ - src/responder/pam/pam_helpers.c \ - src/responder/pam/pamsrv_dp.c \ - src/responder/pam/pam_LOCAL_domain.c \ - $(NULL) -pam_srv_tests_CFLAGS = \ - -U SSSD_LIBEXEC_PATH -DSSSD_LIBEXEC_PATH=\"$(abs_builddir)\" \ - $(AM_CFLAGS) \ - $(NULL) -pam_srv_tests_LDFLAGS = \ - -Wl,-wrap,sss_packet_get_body \ - -Wl,-wrap,sss_packet_get_cmd \ - -Wl,-wrap,sss_cmd_send_empty \ - -Wl,-wrap,sss_cmd_done \ - -Wl,-wrap,pam_dp_send_req \ - $(NULL) -pam_srv_tests_LDADD = \ - $(CMOCKA_LIBS) \ - $(PAM_LIBS) \ - $(SSSD_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ - libsss_test_common.la \ - libsss_idmap.la \ - $(NULL) +#EXTRA_nss_srv_tests_DEPENDENCIES = \ +# $(ldblib_LTLIBRARIES) +#nss_srv_tests_SOURCES = \ +# $(TEST_MOCK_RESP_OBJ) \ +# src/tests/cmocka/test_nss_srv.c \ +# src/responder/nss/nsssrv_cmd.c \ +# src/responder/nss/nsssrv_netgroup.c \ +# src/responder/nss/nsssrv_services.c \ +# src/responder/nss/nsssrv_mmap_cache.c +#nss_srv_tests_CFLAGS = \ +# $(AM_CFLAGS) +#nss_srv_tests_LDFLAGS = \ +# -Wl,-wrap,sss_ncache_check_user \ +# -Wl,-wrap,sss_ncache_check_uid \ +# -Wl,-wrap,sss_ncache_check_sid \ +# -Wl,-wrap,sss_ncache_check_cert \ +# -Wl,-wrap,sss_packet_get_body \ +# -Wl,-wrap,sss_packet_get_cmd \ +# -Wl,-wrap,sss_cmd_send_empty \ +# -Wl,-wrap,sss_cmd_done +#nss_srv_tests_LDADD = \ +# $(CMOCKA_LIBS) \ +# $(SSSD_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# $(SYSTEMD_DAEMON_LIBS) \ +# libsss_test_common.la \ +# libsss_cert.la \ +# libsss_idmap.la + +#EXTRA_pam_srv_tests_DEPENDENCIES = \ +# $(ldblib_LTLIBRARIES) \ +# $(NULL) +#pam_srv_tests_SOURCES = \ +# $(TEST_MOCK_RESP_OBJ) \ +# src/tests/cmocka/test_pam_srv.c \ +# src/sss_client/pam_message.c \ +# src/responder/pam/pamsrv_cmd.c \ +# src/responder/pam/pamsrv_p11.c \ +# src/responder/pam/pam_helpers.c \ +# src/responder/pam/pamsrv_dp.c \ +# src/responder/pam/pam_LOCAL_domain.c \ +# $(NULL) +#pam_srv_tests_CFLAGS = \ +# -U SSSD_LIBEXEC_PATH -DSSSD_LIBEXEC_PATH=\"$(abs_builddir)\" \ +# $(AM_CFLAGS) \ +# $(NULL) +#pam_srv_tests_LDFLAGS = \ +# -Wl,-wrap,sss_packet_get_body \ +# -Wl,-wrap,sss_packet_get_cmd \ +# -Wl,-wrap,sss_cmd_send_empty \ +# -Wl,-wrap,sss_cmd_done \ +# -Wl,-wrap,pam_dp_send_req \ +# $(NULL) +#pam_srv_tests_LDADD = \ +# $(CMOCKA_LIBS) \ +# $(PAM_LIBS) \ +# $(SSSD_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# $(SYSTEMD_DAEMON_LIBS) \ +# libsss_test_common.la \ +# libsss_idmap.la \ +# $(NULL) EXTRA_responder_get_domains_tests_DEPENDENCIES = \ $(ldblib_LTLIBRARIES) @@ -2320,29 +2320,29 @@ fqnames_tests_LDADD = \ $(SSSD_INTERNAL_LTLIBS) \ libsss_test_common.la -nestedgroups_tests_SOURCES = \ - $(TEST_MOCK_PROVIDER_OBJ) \ - src/providers/ldap/sdap_idmap.c \ - src/tests/cmocka/test_nested_groups.c \ - src/tests/cmocka/common_mock_be.c \ - src/providers/ldap/sdap_async_nested_groups.c \ - src/providers/ldap/sdap_ad_groups.c \ - src/providers/ipa/ipa_dn.c \ - $(NULL) -nestedgroups_tests_CFLAGS = \ - $(AM_CFLAGS) \ - -DEXTERNAL_MEMBERS_CHUNK=1 \ - $(NULL) -nestedgroups_tests_LDADD = \ - $(CMOCKA_LIBS) \ - $(SSSD_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_idmap.la \ - libsss_test_common.la \ - $(NULL) -if BUILD_SYSTEMTAP -nestedgroups_tests_LDADD += stap_generated_probes.lo -endif +#nestedgroups_tests_SOURCES = \ +# $(TEST_MOCK_PROVIDER_OBJ) \ +# src/providers/ldap/sdap_idmap.c \ +# src/tests/cmocka/test_nested_groups.c \ +# src/tests/cmocka/common_mock_be.c \ +# src/providers/ldap/sdap_async_nested_groups.c \ +# src/providers/ldap/sdap_ad_groups.c \ +# src/providers/ipa/ipa_dn.c \ +# $(NULL) +#nestedgroups_tests_CFLAGS = \ +# $(AM_CFLAGS) \ +# -DEXTERNAL_MEMBERS_CHUNK=1 \ +# $(NULL) +#nestedgroups_tests_LDADD = \ +# $(CMOCKA_LIBS) \ +# $(SSSD_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# libsss_idmap.la \ +# libsss_test_common.la \ +# $(NULL) +#if BUILD_SYSTEMTAP +#nestedgroups_tests_LDADD += stap_generated_probes.lo +#endif test_sss_idmap_SOURCES = \ src/tests/cmocka/test_sss_idmap.c @@ -2405,19 +2405,19 @@ test_ldap_auth_LDADD = \ libdlopen_test_providers.la \ $(NULL) -test_ldap_id_cleanup_SOURCES = \ - src/tests/cmocka/test_ldap_id_cleanup.c \ - $(NULL) -test_ldap_id_cleanup_LDADD = \ - $(CMOCKA_LIBS) \ - $(POPT_LIBS) \ - $(TALLOC_LIBS) \ - $(TEVENT_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_ldap_common.la \ - libsss_test_common.la \ - libdlopen_test_providers.la \ - $(NULL) +#test_ldap_id_cleanup_SOURCES = \ +# src/tests/cmocka/test_ldap_id_cleanup.c \ +# $(NULL) +#test_ldap_id_cleanup_LDADD = \ +# $(CMOCKA_LIBS) \ +# $(POPT_LIBS) \ +# $(TALLOC_LIBS) \ +# $(TEVENT_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# libsss_ldap_common.la \ +# libsss_test_common.la \ +# libdlopen_test_providers.la \ +# $(NULL) test_sdap_access_SOURCES = \ src/tests/cmocka/test_sdap_access.c \ @@ -2581,21 +2581,21 @@ sss_sifp_tests_LDADD = \ $(SSSD_INTERNAL_LTLIBS) endif # BUILD_IFP -test_sysdb_views_SOURCES = \ - src/tests/cmocka/test_sysdb_views.c \ - src/providers/ipa/ipa_utils.c \ - $(NULL) -test_sysdb_views_CFLAGS = \ - $(AM_CFLAGS) \ - $(NULL) -test_sysdb_views_LDADD = \ - $(CMOCKA_LIBS) \ - $(LDB_LIBS) \ - $(POPT_LIBS) \ - $(TALLOC_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_test_common.la \ - $(NULL) +#test_sysdb_views_SOURCES = \ +# src/tests/cmocka/test_sysdb_views.c \ +# src/providers/ipa/ipa_utils.c \ +# $(NULL) +#test_sysdb_views_CFLAGS = \ +# $(AM_CFLAGS) \ +# $(NULL) +#test_sysdb_views_LDADD = \ +# $(CMOCKA_LIBS) \ +# $(LDB_LIBS) \ +# $(POPT_LIBS) \ +# $(TALLOC_LIBS) \ +# $(SSSD_INTERNAL_LTLIBS) \ +# libsss_test_common.la \ +# $(NULL) test_sysdb_ts_cache_SOURCES = \ src/tests/cmocka/test_sysdb_ts_cache.c \ @@ -3044,27 +3044,28 @@ endif ##################### intgcheck: - set -e; \ - rm -Rf intg; \ - $(MKDIR_P) intg/bld; \ - : Use /hopefully/ short prefix to keep D-Bus socket path short; \ - prefix=`mktemp --tmpdir --directory sssd-intg.XXXXXXXX`; \ - $(LN_S) "$$prefix" intg/pfx; \ - cd intg/bld; \ - $(abs_top_srcdir)/configure \ - --prefix="$$prefix" \ - --with-ldb-lib-dir="$$prefix"/lib/ldb \ - --enable-intgcheck-reqs \ - --without-semanage \ - $(INTGCHECK_CONFIGURE_FLAGS); \ - $(MAKE) $(AM_MAKEFLAGS); \ - : Force single-thread install to workaround concurrency issues; \ - $(MAKE) $(AM_MAKEFLAGS) -j1 install; \ - : Remove .la files from LDB module directory to avoid loader warnings; \ - rm "$$prefix"/lib/ldb/*.la; \ - $(MAKE) $(AM_MAKEFLAGS) -C src/tests/intg intgcheck-installed; \ - cd ../..; \ - rm -Rf "$$prefix" intg + echo "temporarily disabled" +# set -e; \ +# rm -Rf intg; \ +# $(MKDIR_P) intg/bld; \ +# : Use /hopefully/ short prefix to keep D-Bus socket path short; \ +# prefix=`mktemp --tmpdir --directory sssd-intg.XXXXXXXX`; \ +# $(LN_S) "$$prefix" intg/pfx; \ +# cd intg/bld; \ +# $(abs_top_srcdir)/configure \ +# --prefix="$$prefix" \ +# --with-ldb-lib-dir="$$prefix"/lib/ldb \ +# --enable-intgcheck-reqs \ +# --without-semanage \ +# $(INTGCHECK_CONFIGURE_FLAGS); \ +# $(MAKE) $(AM_MAKEFLAGS); \ +# : Force single-thread install to workaround concurrency issues; \ +# $(MAKE) $(AM_MAKEFLAGS) -j1 install; \ +# : Remove .la files from LDB module directory to avoid loader warnings; \ +# rm "$$prefix"/lib/ldb/*.la; \ +# $(MAKE) $(AM_MAKEFLAGS) -C src/tests/intg intgcheck-installed; \ +# cd ../..; \ +# rm -Rf "$$prefix" intg #################### # Client Libraries #