summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-14 15:36:22 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-14 15:36:22 +0100
commit3fbfd869dd0f6993efb66e1dc3ffac38dda7fe5e (patch)
tree30551483e3199b27595b16ea088a9c35bf64bbb5
parent97ee4c24b439bbe2197b7ba492518da08f37b9fe (diff)
downloadjenkins.debian.net-3fbfd869dd0f6993efb66e1dc3ffac38dda7fe5e.tar.xz
torbrowser-launcher tests: fix schroot creation
-rwxr-xr-xbin/schroot-create.sh9
-rwxr-xr-xbin/test_torbrowser-launcher.sh4
2 files changed, 10 insertions, 3 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 4f572f2f..c8a5c792 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -21,6 +21,7 @@ if [ $# -lt 2 ]; then
exit 1
fi
+declare -a EXTRA_SOURCES
if [ "$1" = "backports" ] ; then
EXTRA_SOURCES[2]="deb $MIRROR ${SUITE}-backports main"
EXTRA_SOURCES[3]="deb-src $MIRROR ${SUITE}-backports main"
@@ -34,6 +35,13 @@ if [ "$1" = "reproducible" ] ; then
shift
fi
+if [ "$1" = "torbrowser-launcher" ] ; then
+ EXTRA_SOURCES[4]="deb $MIRROR ${SUITE} contrib"
+ EXTRA_SOURCES[5]="deb-src $MIRROR ${SUITE} contrib"
+ shift
+fi
+
+
TARGET="$1"
shift
SUITE="$1"
@@ -41,7 +49,6 @@ shift
TMPLOG=$(mktemp --tmpdir=$TMPDIR schroot-create-XXXXXXXX)
-declare -a EXTRA_SOURCES
if [ "$SUITE" = "experimental" ] ; then
# experimental cannot be bootstrapped
SUITE=sid
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 68384eaf..0bb46d1a 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -39,9 +39,9 @@ cd $TMPDIR
SUITE=$1
echo "$(date -u) - testing torbrowser-launcher on $SUITE now."
#
-# this is WIP in an early stage (and it will not work as X aint configured yet)
+# this is WIP in an early stage (and it won't work as X ain't configured yet)
# - test package build from git (todo)
-# - test package from the archive (done)
+# - test package from the archive (in progress)
# - test updates (todo)
#
first_test