The compile-time and run-time version of httpd may not be the same.
Since the tests rely on it to interpret test case results, make sure
that they see the run-time version.
* subversion/tests/cmdline/davautocheck.sh
(HTTPD_VERSION): New; get it from apxs.
Override the httpd version for 'make check' etc.
@@ -778,14 +778,16 @@ else
|| fail "Subversion client couldn't find and/or load ra_dav library '$HTTP_LIBRARY'"
fi
+HTTPD_VERSION="$($APXS -q HTTPD_VERSION)"
+
if [ $# = 0 ]; then
- TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR
+ TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" "HTTPD_VERSION=$HTTPD_VERSION" $SSL_MAKE_VAR
r=$?
else
(cd "$ABS_BUILDDIR/subversion/tests/cmdline/"
TEST="$1"
shift
- TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@")
+ TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" "--httpd-version=$HTTPD_VERSION" $SSL_TEST_ARG "$@")
r=$?
fi
