|
@@ -190,7 +190,7 @@ aptmark() { runapt apt-mark "$@"; }
|
|
|
aptsortpkgs() { runapt apt-sortpkgs "$@"; }
|
|
|
apt() { runapt apt "$@"; }
|
|
|
apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; }
|
|
|
-aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; }
|
|
|
+aptwebserver() { runapt "${APTTESTHELPERSBINDIR}/aptwebserver" "$@"; }
|
|
|
aptitude() { runapt aptitude "$@"; }
|
|
|
aptextracttemplates() { runapt apt-extracttemplates "$@"; }
|
|
|
aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; }
|
|
@@ -331,7 +331,7 @@ setupenvironment() {
|
|
|
LIBRARYPATH="${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}/../apt-pkg"}"
|
|
|
METHODSDIR="${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/../methods"}"
|
|
|
APTHELPERBINDIR="${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}"
|
|
|
- APTWEBSERVERBINDIR="${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}/../test/interactive-helper"}"
|
|
|
+ APTTESTHELPERSBINDIR="${APT_INTEGRATION_TESTS_HELPERS_BIN_DIR:-"${BUILDDIRECTORY}/../test/interactive-helper"}"
|
|
|
APTFTPARCHIVEBINDIR="${APT_INTEGRATION_TESTS_FTPARCHIVE_BIN_DIR:-"${BUILDDIRECTORY}/../ftparchive"}"
|
|
|
APTINTERNALSOLVER="${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/solvers/apt"}"
|
|
|
APTDUMPSOLVER="${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/solvers/dump"}"
|
|
@@ -1296,7 +1296,7 @@ changetowebserver() {
|
|
|
else
|
|
|
shift
|
|
|
fi
|
|
|
- if test -x "${APTWEBSERVERBINDIR}/aptwebserver"; then
|
|
|
+ if test -x "${APTTESTHELPERSBINDIR}/aptwebserver"; then
|
|
|
cd aptarchive
|
|
|
local LOG="webserver.log"
|
|
|
if ! aptwebserver --port 0 -o aptwebserver::fork=1 -o aptwebserver::portfile='aptwebserver.port' "$@" >$LOG 2>&1 ; then
|