1From 330b77081c3a4c7ae76cb08602db385b40fa7ff7 Mon Sep 17 00:00:00 2001
2From: Simone Weiss <simone.weiss@elektrobit.com>
3Date: Mon, 13 Dec 2021 09:29:53 +0000
4Subject: [PATCH] popt test output format for ptest
5
6patch test output format to match simple-test as it is used in ptests.
7
8Upstream-Status: Pending
9
10Signed-off-by: Simone Weiss <simone.weiss@elektrobit.com>
11Signed-off-by: David Niederpruem <david.niederpruem@elektrobit.com>
12---
13 tests/testit.sh | 20 ++++++++------------
14 1 file changed, 8 insertions(+), 12 deletions(-)
15
16diff --git a/tests/testit.sh b/tests/testit.sh
17index 2a7b4aa..50b42e2 100755
18--- a/tests/testit.sh
19+++ b/tests/testit.sh
20@@ -5,12 +5,11 @@ run() {
21     name=$1; shift
22     answer=$1; shift
23
24-    echo Running test $name.
25-
26     result=`HOME=$builddir $builddir/$prog $*`
27     if [ "$answer" != "$result" ]; then
28-	echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" "
29-	exit 2
30+        echo "FAIL: $name"
31+    else
32+        echo "PASS: $name"
33     fi
34 }
35
36@@ -23,17 +22,17 @@ run_diff() {
37     out=$builddir/tmp.out
38     diff_file=$builddir/tmp.diff
39
40-    echo Running test $name.
41-
42     $builddir/$prog $in_file > $out
43     ret=$?
44     diff $out $answer_file > $diff_file
45     diff_ret=$?
46
47     if [ "$diff_ret" != "0" ]; then
48-       echo "Test \"$name\" failed output is in $out, diff is:"
49-       cat $diff_file
50-       exit 2
51+        echo "FAIL: $name"
52+        echo "diff is:"
53+        cat $diff_file
54+    else
55+        echo "PASS: $name"
56     fi
57     rm $out $diff_file
58 }
59@@ -174,6 +173,3 @@ Help options:
60 #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
61 #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
62 #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer
63-
64-echo ""
65-echo "Passed."
66--
672.17.1
68
69