testsuite: simplify syntax

Change-Id: Id6883b2156a99859905e2ae61ffbfe462cf65ff9

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index 079bf5f..032722e 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -76,32 +76,32 @@ LOG_DETAILS="testing if -u argument is parsed properly"
 dlogutil -du dummy &> /dev/null && fail || ok
 
 LOG_DETAILS="testing if limiting printed log entries to less than exists in the buffer returns proper value"
-if [ $(dlogutil -b main -t  20 | wc -l) -eq  20 ]; then ok; else fail; fi # less logs than currently in buffer
+[ $(dlogutil -b main -t  20 | wc -l) -eq  20 ] && ok || fail # less logs than currently in buffer
 
 LOG_DETAILS="testing if limiting printed log entries to more than exists in the buffer returns proper value"
-if [ $(dlogutil -b main -t 200 | wc -l) -eq 100 ]; then ok; else fail; fi # more
+[ $(dlogutil -b main -t 200 | wc -l) -eq 100 ] && ok || fail # more
 
 LOG_DETAILS="testing if dlogutil returns exact amount of entries as there is in the buffer"
-if [ $(dlogutil -b main -d     | wc -l) -eq 100 ]; then ok; else fail; fi # exactly
+[ $(dlogutil -b main -d     | wc -l) -eq 100 ] && ok || fail # exactly
 
 LOG_DETAILS="testing if reading from  dummy buffer returns an error as expected"
 dlogutil -b nonexistent_buffer &> /dev/null && fail || ok
 
 LOG_DETAILS="testing if reading from \"system\" buffer returns zero entries (logs are in the \"main\" buffer)"
-if [ $(dlogutil -d -b system | wc -l) -eq 0 ]; then ok; else fail; fi
+[ $(dlogutil -d -b system | wc -l) -eq 0 ] && ok || fail
 
 LOG_DETAILS="testing if dlogutil -c empties all buffers"
 dlogutil -c && ok || fail
 
 LOG_DETAILS="testing if writing entries to empty buffer and reading them returns proper amount of entries"
 test_libdlog 10
-if [ $(dlogutil -b main -d | wc -l) -eq 10 ]; then ok; else fail; fi # should be 10, not 110
+[ $(dlogutil -b main -d | wc -l) -eq 10 ] && ok || fail # should be 10, not 110
 
 LOG_DETAILS="testing if filters work"
-if [ $(dlogutil -b main -d *:E | wc -l) -eq 5 ]; then ok; else fail; fi # half of current logs (test_libdlog alternates between error and info log levels)
+[ $(dlogutil -b main -d *:E | wc -l) -eq 5 ] && ok || fail # half of current logs (test_libdlog alternates between error and info log levels)
 
 LOG_DETAILS="testing if adding \"silent\" filter works"
-if [ $(dlogutil -b main -s -d | wc -l) -eq 0 ]; then ok; else fail; fi
+[ $(dlogutil -b main -s -d | wc -l) -eq 0 ] && ok || fail
 
 LOG_DETAILS="testing if reading buffer size returns proper exit code"
 dlogutil -g &> /dev/null && ok || fail
@@ -144,67 +144,67 @@ regex_timezone="[\+-]{1}[0-9]{4}"
 REGEX="s/^$regex_prio\([0-9[:space:]]{5,}\)[[:print:]]*\([[:print:]]*\)$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="tag"
 REGEX="s/^$regex_prio\/[[:print:]]{9,}:\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="thread"
 REGEX="s/^$regex_prio\($regex_pidtid\)\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="time"
 REGEX="s/^$regex_time.[0-9]{3}$regex_timezone\s{1}$regex_prio\/[[:print:]]{8,}\([0-9[:space:]]{5,}\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="threadtime"
 REGEX="s/^$regex_time.[0-9]{3}$regex_timezone\s{1}$regex_prio\/[[:print:]]{8,}\($regex_pidtid\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="kerneltime"
 REGEX="s/^[0-9[:space:]]{1,}.[0-9]{3,}\s{1}$regex_prio\/[[:print:]]{8,}\($regex_pidtid\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="recv_realtime"
 REGEX="s/^$regex_time.[0-9]{3}\s{1}$regex_prio\/[[:print:]]{8,}\($regex_pidtid\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="rwtime"
 REGEX="s/^$regex_time\s{1}\[[0-9[:space:]]{3,}.[0-9[:space:]]{3,}\]\s{1}$regex_prio\/[[:print:]]{8,}\($regex_pidtid\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="long"
 REGEX="s/^\[\s{1}$regex_time.[0-9]{3,}\s{1}$regex_prio\/[[:print:]]{8,}\s{1}$regex_pidtid\]\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | tr '\n' ' ' | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | tr '\n' ' ' | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="brief"
 REGEX="s/^$regex_prio\/[[:print:]]{8,}\([0-9[:space:]]{5,}\):\s{1}[[:print:]]*$/1/g"
 LOG_DETAILS="testing if \"$format\" print format works"
 line=`$cmd $format`
-if [[ `echo "$line" | sed -re $REGEX` == "1" ]]; then ok; else fail; fi
+[[ `echo "$line" | sed -re $REGEX` == "1" ]] && ok || fail
 
 format="raw"
 LOG_DETAILS="testing if \"$format\" print format works"
 dlogsend -b main -t DLOG_TESTSUITE rawformatTEST
 line=`$cmd $format`
-if [[ "$line" == "rawformatTEST" ]]; then ok; else fail; fi
+[[ "$line" == "rawformatTEST" ]] && ok || fail
 
 LOG_DETAILS="testing if pid filtering works"
 dlogsend -b main -t DLOG_TESTSUITE pidTEST &