Commit 46f99a4f authored by Joe Orton's avatar Joe Orton
Browse files

* configure.in, Makefile.in: Handle no-test-suite case through 

  check-no rule.  Only regenerate the test suite on repeated
  "make check" run if a header file has changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833122 13f79535-47bb-0310-9956-ffa450edef68
parent d0112537

Makefile.in

+18 −8
Changes for Makefile.in: 18 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -430,17 +430,27 @@ check/build/config_vars.mk: build/config_vars.out 
	echo "sbindir = $(top_builddir)/check/bin" >> $@

	echo "bindir = $(top_builddir)/check/bin" >> $@



# Run the Apache::Test suite if it has been configured with --with-test-suite.

check: check-include check-dirs check-conf check/build/config_vars.mk check-binaries

	@if test "x$(TEST_SUITE_LOCATION)" = "xno"; then \

	    echo 'Re-run configure with the --with-test-suite option to enable in-tree tests.'; \

	    false; \

	fi

# Generate config & modules etc from scratch any time a header file is

# touched, so e.g. we don't get MMN mismatch against the modules built

# in .../c-modules.

$(TEST_SUITE_LOCATION)/Makefile: $(TEST_SUITE_LOCATION)/Makefile.PL $(INSTALL_HEADERS)

	cd "$(TEST_SUITE_LOCATION)" && \

	    perl Makefile.PL -apxs "$(top_builddir)/check/bin/apxs" && \

	    ./t/TEST -clean && \

	    ./t/TEST -config && \

	    ./t/TEST $(TESTS)

	    ./t/TEST -config



check-make: $(TEST_SUITE_LOCATION)/Makefile



check-no:

	@echo 'Re-run configure with the --with-test-suite option to enable in-tree tests.'

	@false



check-yes: check-include check-dirs check-conf check/build/config_vars.mk \

	check-binaries $(TEST_SUITE_LOCATION)/Makefile

	cd $(TEST_SUITE_LOCATION) && ./t/TEST $(TESTS)



# Run the Apache::Test suite if it has been configured with --with-test-suite.

check: check-$(WITH_TEST_SUITE)



#

# Unit Test Suite

configure.in

+3 −1
Changes for configure.in: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -923,12 +923,14 @@ AC_ARG_WITH([test-suite], 
        else

            test -f "$withval/Makefile.PL" || AC_MSG_ERROR([--with-test-suite directory $withval does not contain the expected Makefile.PL])

            TEST_SUITE_LOCATION="$withval"

            WITH_TEST_SUITE=yes

        fi

    ],

    [ TEST_SUITE_LOCATION="no" ]

    [ WITH_TEST_SUITE=no ]

)



APACHE_SUBST(TEST_SUITE_LOCATION)

APACHE_SUBST(WITH_TEST_SUITE)



APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 

APACHE_FAST_OUTPUT(os/Makefile server/Makefile)