From b08c1db715142a86460160f794f8ca0f22d8bc63 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Fri, 30 Sep 2016 04:23:57 +0300 Subject: Make dcop tests run without X Signed-off-by: Alexander Golubev (cherry picked from commit 7f6c0b1c7d39628a7c1f3cc4271f92054fe151eb) --- dcop/tests/run-tests.sh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'dcop/tests/run-tests.sh') diff --git a/dcop/tests/run-tests.sh b/dcop/tests/run-tests.sh index b088905b0..1645b0696 100644 --- a/dcop/tests/run-tests.sh +++ b/dcop/tests/run-tests.sh @@ -5,30 +5,44 @@ clean_up() { clean_up +../dcopserver --nofork & +DCOP_SERVER_PID=$! + +die() { + kill $DCOP_SERVER_PID + echo "$1" + exit 1; +} + echo '* Running batch mode' -./dcop_test --batch >batch.stdout +./dcop_test --batch >batch.stdout || die "Failed to run dcop_test" echo -n '* Starting test app ' ./dcop_test >shell.stdout & +DCOP_TEST_PID=$! -while ! dcop | grep -q TestApp; do echo -n '.'; sleep 2; done +while ! ../client/dcop | grep -q "TestApp-$DCOP_TEST_PID"; do + echo -n '.' + sleep 2 + kill -0 "$DCOP_TEST_PID" || die "dcop_test died unexpectadly" +done echo ' started' echo '* Running driver mode' -./driver `dcop 'TestApp-*'` >driver.stdout +./driver "TestApp-$DCOP_TEST_PID" >driver.stdout || die "Failed to start driver" echo '* Running shell mode' source ./shell.generated >shell.returns echo -n '* Comparing ... ' -compare() +compare() { if ! diff -q --strip-trailing-cr $1 $2; then echo "FAILED:" diff -u $1 $2 - exit 1; + die "$1 and $2 are different"; fi } @@ -39,6 +53,6 @@ compare batch.returns driver.returns clean_up +kill $DCOP_SERVER_PID echo "Passed" exit 0; - -- cgit v1.2.1