Commit 7c564ce3 authored by Niko Tyni's avatar Niko Tyni

autopkgtest/smoke: support xvfb configuration in smoke-env

PKG_PERL_XVFB_SERVER_ARGS is separate from PKG_PERL_XVFB_ARGS mainly
because of whitespace quoting problems.

Closes: #895190
parent 5fa07aea
......@@ -37,6 +37,7 @@ export NONINTERACTIVE_TESTING=1
# overridable with smoke-env
PKG_PERL_PROVE_ARGS="--verbose --recurse --merge"
PKG_PERL_XVFB_ARGS="-a"
env_list=debian/tests/pkg-perl/smoke-env
if [ ! -r $env_list ]; then
......@@ -151,9 +152,11 @@ fi
if command -v xvfb-run >/dev/null
then
XVFB="xvfb-run -a"
XVFB=xvfb-run
else
XVFB=
PKG_PERL_XVFB_ARGS=
PKG_PERL_XVFB_SERVER_ARGS=
fi
if [ -z "$test_targets" ] && [ -d t ]; then test_targets=t; fi
......@@ -161,7 +164,7 @@ if [ -z "$test_targets" ] && [ -d t ]; then test_targets=t; fi
if [ ! -n "$test_targets" ]; then
echo 'Nothing to prove, skipping.'
else
$XVFB prove -I"$TDIR" --blib $PKG_PERL_PROVE_ARGS $test_targets 2>&1
$XVFB $PKG_PERL_XVFB_ARGS ${PKG_PERL_XVFB_SERVER_ARGS:+-s} ${PKG_PERL_XVFB_SERVER_ARGS:+"$PKG_PERL_XVFB_SERVER_ARGS"} prove -I"$TDIR" --blib $PKG_PERL_PROVE_ARGS $test_targets 2>&1
fi
if [ -f test.pl ]; then $XVFB perl -I"$TDIR" ./test.pl; fi 2>&1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment