Wait for akonaditest to write environment file.HEADmaster

2 files changed, 21 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 49e9931..2dcdbd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,8 @@ prefix.sh
 /src/org.kde.Akonadi.*.Settings.xml
 /src/settingsadaptor.moc_parameters
 
-test/testenv.sh
+/test/testenv.sh
+/test/xdgdata/decsync
 
 # CMake cache files etc.
 # from https://github.com/github/gitignore/blob/master/CMake.gitignore
diff --git a/test/test.sh b/test/test.sh
index eebd01d..5c3bf14 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,11 +1,28 @@
-#!/bin/sh
+#!/usr/bin/bash
+msg() {
+    printf '\n\n' >&2
+    printf ' ==> %s\n' "$@" >&2
+    printf '\n\n' >&2
+}
+
+msg 'REPLACING TEST DECSYNC DATA'
 rm -rf xdgdata/decsync &&
     cp -a ~/sync/decsync xdgdata/decsync ||
         exit 1
 
+msg 'RUNNING AKONADITEST'
+rm -f testenv.sh
 akonaditest -c config.xml --testenv testenv.sh &
-sleep 1s
+
+msg 'WAITING...'
+until [ -f testenv.sh ]; do sleep 1s; done
+
+msg 'SOURCING TESTENV.SH'
 . ./testenv.sh || exit 2
+
+msg 'RUNNING AKONADICONSOLE'
 akonadiconsole
+
+msg 'SHUTTING DOWN'
 shutdown-testenvironment
 wait