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