summaryrefslogtreecommitdiffstats
path: root/run_test_suite
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-03-08 01:08:40 +0100
committerTails developers <amnesia@boum.org>2013-03-08 01:48:18 +0100
commit486f45ed95cd872c6afc80bd5fb1e62911ee4f2d (patch)
tree7d44f174a049032a0998334cda07999b6416b261 /run_test_suite
parent827d3baf792f60bd2a5341a5818a6c996131e2cc (diff)
Move code from wrapper to cucumber environment.
It really belongs there, and helps when not using the wrapper.
Diffstat (limited to 'run_test_suite')
-rwxr-xr-xrun_test_suite22
1 files changed, 0 insertions, 22 deletions
diff --git a/run_test_suite b/run_test_suite
index 56bcd4b..a463359 100755
--- a/run_test_suite
+++ b/run_test_suite
@@ -141,21 +141,6 @@ for dep in git libvirt-bin libvirt-dev virt-viewer libsikuli-script-java \
check_dependency "${dep}"
done
-if [ -z "${TEMP_DIR}" ]; then
- TEMP_DIR=/tmp/TailsToaster
-fi
-if [ ! -e "${TEMP_DIR}" ]; then
- mkdir -p "${TEMP_DIR}"
-fi
-if [ ! -d "${TEMP_DIR}" ]; then
- error "${TEMP_DIR} is not a directory"
-fi
-for t in r w x; do
- if [ ! -${t} "${TEMP_DIR}" ]; then
- error "Insufficient permissions for ${TEMP_DIR}"
- fi
-done
-
TARGET_DISPLAY=$(next_free_display)
start_xvfb
@@ -170,13 +155,6 @@ if [ -n "${VNC_VIEWER}" ]; then
start_vnc_viewer
fi
-# Workaround: similarly to above, when libvirt takes ownership of the
-# ISO image it may become unreadable for the amnesia user inside guest
-# in the host-to-guest share used for some tests.
-if [ -O "${ISO}" ]; then
- chmod a+r "${ISO}"
-fi
-
export SIKULI_HOME="/usr/share/java"
export DISPLAY=${TARGET_DISPLAY}
export TEMP_DIR="${TEMP_DIR}"