From 07bb297329b9e9754d09dcb6d70417272a626619 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 22 Nov 2012 10:31:06 -0800 Subject: Imported Upstream version 1.2.14 --- Makefile.am | 114 +++++++++++++++++++----------------------------------------- 1 file changed, 35 insertions(+), 79 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 669f996b..3fce5488 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,11 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 DISTCLEANFILES = \ xmlsec1Conf.sh \ - xmlsec1.pc \ - xmlsec1-openssl.pc \ - xmlsec1-nss.pc \ - xmlsec1-gnutls.pc \ - xmlsec1-gcrypt.pc \ + xmlsec1.pc xmlsec1-openssl.pc xmlsec1-gnutls.pc xmlsec1-nss.pc \ xmlsec1-config \ xmlsec1.spec \ stamp-h2 \ @@ -40,10 +36,7 @@ EXTRA_DIST = \ ChangeLog \ Copyright \ HACKING \ - xmlsec-openssl.pc.in \ - xmlsec-nss.pc.in\ - xmlsec-gnutls.pc.in \ - xmlsec-gcrypt.pc.in \ + xmlsec-openssl.pc.in xmlsec-gnutls.pc.in xmlsec-nss.pc.in\ xmlsec-config.in \ xmlsecConf.sh.in \ xmlsec.spec.in \ @@ -64,6 +57,9 @@ if XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING PRECHECK_COMMANDS = \ cd $(ABS_SRCDIR) \ $(NULL) +CHECK_CRYPTO_LIST = \ + "default" \ + $(NULL) else PRECHECK_COMMANDS= \ for i in $(XMLSEC_CRYPTO_LIST) ; do \ @@ -71,10 +67,10 @@ PRECHECK_COMMANDS= \ done && \ cd $(ABS_SRCDIR) \ $(NULL) -endif CHECK_CRYPTO_LIST = \ $(XMLSEC_CRYPTO_LIST) \ $(NULL) +endif docs: docs-man @(cd docs && $(MAKE) docs) @@ -85,85 +81,47 @@ docs-clean: docs-man: @(cd man && $(MAKE) docs) -check: check-all check-info +check: check-all check-info check-all: $(TEST_APP) @($(PRECHECK_COMMANDS) && \ - for crypto in $(CHECK_CRYPTO_LIST) ; do \ - echo "=================== Checking xmlsec-$$crypto =================================" && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testKeys.sh \ - $$crypto \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) der \ - && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testDSig.sh \ - $$crypto \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testEnc.sh \ - $$crypto \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - ; \ + for i in $(CHECK_CRYPTO_LIST) ; do \ + echo "=================== Checking xmlsec-$$i =================================" && \ + $(SHELL) ./tests/testKeys.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der && \ + $(SHELL) ./tests/testDSig.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der && \ + $(SHELL) ./tests/testEnc.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der ; \ done; ) check-info: - @echo "---------------------------- ATTENTION -----------------------------------" - @echo "--- Some of the tests use resources located on external HTTP servers. ---" - @echo "--- If you have no Internet connection or the external resource is not ---" - @echo "--- responding then the test will fail. ---" - @echo "---------------------------- ATTENTION -----------------------------------" - -check-keys: $(TEST_APP) + @echo "-------------------------- ATTENTION -----------------------------------" + @echo "--- 1) Some of the following tests use resources located on external ---" + @echo "--- HTTP servers. If you have no Internet connection or the external ---" + @echo "--- resource is not responding then the test will fail. ---" + @echo "--- 2) The test fails if corresponding feature(s) is disabled. ---" + @echo "--- Please, don't be surprised that many XML Encryption tests fails ---" + @echo "--- when you use OpenSSL 0.9.6 (see the FAQ for details) ---" + @echo "-------------------------- ATTENTION -----------------------------------" + +check-km: $(TEST_APP) @($(PRECHECK_COMMANDS) && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testKeys.sh \ - $(DEFAULT_CRYPTO) \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - ) + $(SHELL) ./tests/testKeys.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der) check-dsig: $(TEST_APP) @($(PRECHECK_COMMANDS) && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testDSig.sh \ - $(DEFAULT_CRYPTO) \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - ) + $(SHELL) ./tests/testDSig.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der) -check-enc: $(TEST_APP) +check-xkms: $(TEST_APP) @($(PRECHECK_COMMANDS) && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testEnc.sh \ - $(DEFAULT_CRYPTO) \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - ) + $(SHELL) ./tests/testXKMS.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der) -check-xkms: $(TEST_APP) +check-enc: $(TEST_APP) @($(PRECHECK_COMMANDS) && \ - $(SHELL) ./tests/testrun.sh \ - $(ABS_SRCDIR)/tests/testXKMS.sh \ - $(DEFAULT_CRYPTO) \ - $(ABS_SRCDIR)/tests \ - $(ABS_BUILDDIR)/$(TEST_APP) \ - der \ - ) + $(SHELL) ./tests/testEnc.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der) memcheck-res: - @grep -i 'ERROR SUMMARY' /tmp/*.log | sed 's/.*==.*== *//' | sort -u - @grep -i 'in use at exit' /tmp/*.log | sed 's/.*==.*== *//' | sort -u - @grep -i 'total heap usage' /tmp/*.log | sed 's/.*==.*== *//' | sort -u + @grep -i lost /tmp/*.log | sed 's/==.*== *//' | sort -u + @grep -i leak /tmp/*.log | sed 's/==.*== *//' | sort -u + @grep -i 'in use' /tmp/*.log | sed 's/==.*== *//' | sort -u memcheck: $(TEST_APP) @(export DEBUG_MEMORY=1 && $(MAKE) check && $(MAKE) memcheck-res) @@ -176,11 +134,9 @@ dist-hook: cleantar: @($(RM) -f xmlsec*.tar.gz COPYING.LIB) -tar-release: clean cleantar - @(unset CDPATH && $(MAKE) dist) +rpm: cleantar + @(unset CDPATH && $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) -rpm: cleantar tar-release - @(unset CDPATH && rpmbuild -ta $(distdir).tar.gz) - -rpm-release: clean cleantar rpm +rpm-release: clean cleantar rpm + -- cgit v1.2.3