From ac3d706eb4bfead921c7e739e5e95a186bf35438 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Wed, 8 Apr 2020 17:05:39 -0400 Subject: [PATCH 09/10] fix: test/regression/gh599: use expr to be more portable dash was failing due to not having "let". So lets use "expr" instead. Fixes: e887c16512ab ("test: log: verify logging still works after truncate") (cherry picked from commit eba44b2ebeedccbac0329a56c86c5d8f26c30f9f) (cherry picked from commit cdd7c9d60624a443a0a07c29081d0ef68a384beb) --- src/tests/regression/gh599.at | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/regression/gh599.at b/src/tests/regression/gh599.at index 337e18018baf..b0a230733c85 100644 --- a/src/tests/regression/gh599.at +++ b/src/tests/regression/gh599.at @@ -3,6 +3,7 @@ AT_KEYWORDS(gh599) AT_SKIP_IF([! NS_CMD([which truncate >/dev/null 2>&1])]) AT_SKIP_IF([! NS_CMD([which wc >/dev/null 2>&1])]) +AT_SKIP_IF([! NS_CMD([which expr >/dev/null 2>&1])]) dnl Verify we continue to write to the log file after it's truncated. That is, dnl simulate logrotate's copytruncate. @@ -11,6 +12,6 @@ NS_CHECK([truncate -s 0 ./firewalld.log]) dnl generate some logs FWD_CHECK([-q --add-service=this_does_not_exist], 101, [ignore], [ignore]) -NS_CHECK([sh -c 'let "$(cat ./firewalld.log | wc -c) > 0"']) +NS_CHECK([expr $(cat ./firewalld.log | wc -c) ">" 0], 0, [ignore], [ignore]) FWD_END_TEST([-e '/ERROR: INVALID_SERVICE: this_does_not_exist/d']) -- 2.25.2