[PATCH 3/4] testsuite: Separate common part of kas-based test example

[Uladzimir Bely <ubely@ilbers.de>]

Avocado installation and configuration are steps required
by any kind of testing (qemu or hardware).

Separate appropriate stuff out of run_test.sh.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta-isar/test/common.sh      | 30 ++++++++++++++++++++++++++++++
 meta-isar/test/run_test.sh    | 33 +++++----------------------------
 meta-isar/test/sample_test.py |  0
 3 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100755 meta-isar/test/common.sh
 mode change 100644 => 100755 meta-isar/test/sample_test.py

diff --git a/meta-isar/test/common.sh b/meta-isar/test/common.sh
new file mode 100755
index 00000000..e0e4ee6c
--- /dev/null
+++ b/meta-isar/test/common.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Make Isar testsuite accessable
+export PYTHONPATH=${PYTHONPATH}:${TESTSUITEDIR}
+
+# install avocado in virtualenv in case it is not there already
+if ! command -v avocado > /dev/null; then
+    sudo apt-get -y update
+    sudo apt-get -y install virtualenv
+    rm -rf /tmp/avocado_venv
+    virtualenv --python python3 /tmp/avocado_venv
+    source /tmp/avocado_venv/bin/activate
+    pip install avocado-framework==100.1
+fi
+
+# Start tests in this dir
+BASE_DIR="/build/avocado"
+
+# Provide working path
+mkdir -p .config/avocado
+cat <<EOF > .config/avocado/avocado.conf
+[datadir.paths]
+base_dir = ${BASE_DIR}/
+data_dir = ${BASE_DIR}/data
+logs_dir = ${BASE_DIR}/logs
+test_dir = ${BASE_DIR}/test
+EOF
+export VIRTUAL_ENV="./"
diff --git a/meta-isar/test/run_test.sh b/meta-isar/test/run_test.sh
index c4a7d4ac..6083e635 100755
--- a/meta-isar/test/run_test.sh
+++ b/meta-isar/test/run_test.sh
@@ -1,17 +1,10 @@
 #!/usr/bin/env bash
 
-# Make Isar testsuite accessable
-export PYTHONPATH=${PYTHONPATH}:${TESTSUITEDIR}
+set -e
 
-# install avocado in virtualenv in case it is not there already
-if ! command -v avocado > /dev/null; then
-    sudo apt-get -y update
-    sudo apt-get -y install virtualenv
-    rm -rf /tmp/avocado_venv
-    virtualenv --python python3 /tmp/avocado_venv
-    source /tmp/avocado_venv/bin/activate
-    pip install avocado-framework==100.1
-fi
+test_dir=$(dirname $(realpath $0))
+
+. ${test_dir}/common.sh
 
 # Install qemu
 if ! command -v qemu-system-aarch64 > /dev/null; then
@@ -19,21 +12,5 @@ if ! command -v qemu-system-aarch64 > /dev/null; then
   sudo apt-get -y install --no-install-recommends qemu-system-aarch64 ipxe-qemu
 fi
 
-# Start tests in this dir
-BASE_DIR="/build/avocado"
-
-# Provide working path
-mkdir -p .config/avocado
-cat <<EOF > .config/avocado/avocado.conf
-[datadir.paths]
-base_dir = ${BASE_DIR}/
-data_dir = ${BASE_DIR}/data
-logs_dir = ${BASE_DIR}/logs
-test_dir = ${BASE_DIR}/test
-EOF
-export VIRTUAL_ENV="./"
-
-tsd=$(dirname $(realpath $0))/scripts
-
 # Run SSH tests
-avocado run --max-parallel-tasks=1 /work/sample_test.py -p test_script_dir=${tsd}
+avocado run --max-parallel-tasks=1 /work/sample_test.py -p test_script_dir=${test_dir}
diff --git a/meta-isar/test/sample_test.py b/meta-isar/test/sample_test.py
old mode 100644
new mode 100755
-- 
2.20.1