1From 29f811d9d381f2ab54b3c8cef77334e32970ef09 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Tue, 21 Jul 2015 02:01:22 +0900
4Subject: [PATCH] Fix the test output format
5
6Upstream-Status: Pending
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
10Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
11
12---
13 test/regress  |  6 +++---
14 test/regress2 | 11 +++++------
15 2 files changed, 8 insertions(+), 9 deletions(-)
16
17diff --git a/test/regress b/test/regress
18index f06b22f..2fdfacb 100755
19--- a/test/regress
20+++ b/test/regress
21@@ -78,6 +78,7 @@ probe_hardware()
22 	if [ $numnodes -lt 2 ] ; then
23 	    echo "need at least two nodes with at least $NEEDPAGES each of"
24 	    echo "free memory for mempolicy regression tests"
25+	    echo "SKIP: numa regress"
26 	    exit 77  # Skip test
27 	fi
28 }
29@@ -209,10 +210,9 @@ main()
30 	rm A B
31
32 	if [ "$EXIT" = 0 ] ; then
33-		echo '========SUCCESS'
34+		echo 'PASS: numactl regress'
35 	else
36-		echo '========FAILURE'
37-		exit 1
38+		echo 'FAIL: numactl regress'
39 	fi
40 }
41
42diff --git a/test/regress2 b/test/regress2
43index aa6ea41..450c510 100755
44--- a/test/regress2
45+++ b/test/regress2
46@@ -9,12 +9,11 @@ testdir=`dirname "$0"`
47 export PATH=${builddir}:$PATH
48
49 T() {
50-       echo "$@"
51-       if ! $VALGRIND "$@" ;  then
52-	  echo	$1 FAILED!!!!
53-	  exit 1
54-       fi
55-       echo
56+	if ! $VALGRIND "$@" 2>&1 1>/dev/null;  then
57+	   echo  "FAIL: $1"
58+	else
59+	   echo "PASS: $1"
60+	fi
61 }
62
63 # still broken
64