add volatile sources support in libapt-pkg

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 6ae5003f7b23deae28e3069ec50c31a8151d539f..f3cc1eff9ed37f7d0f57550fab957687e2bb341b 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -99,10 +99,14 @@ msgdone() {
 }
 getaptconfig() {
        if [ -f ./aptconfig.conf ]; then
 }
 getaptconfig() {
        if [ -f ./aptconfig.conf ]; then

-            echo "./aptconfig.conf"
+               echo "$(readlink -f ./aptconfig.conf)"

        elif [ -f ../aptconfig.conf ]; then
        elif [ -f ../aptconfig.conf ]; then

-            echo "../aptconfig.conf"
-        fi
+               echo "$(readlink -f ../aptconfig.conf)"
+       elif [ -f ../../aptconfig.conf ]; then
+               echo "$(readlink -f ../../aptconfig.conf)"
+       elif [ -f "${TMPWORKINGDIRECTORY}/aptconfig.conf" ]; then
+               echo "$(readlink -f "${TMPWORKINGDIRECTORY}/aptconfig.conf")"
+       fi

 }
 runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "
 }
 runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "


@@ -141,6 +145,8 @@ gdb() {
        case "$1" in
        aptget) CMD="apt-get";;
        aptcache) CMD="apt-cache";;
        case "$1" in
        aptget) CMD="apt-get";;
        aptcache) CMD="apt-cache";;

+       aptcdrom) CMD="apt-cdrom";;
+       aptconfig) CMD="apt-config";;

        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;