richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
984f77
From f784cdd269ccba28e3e14b24ecd33ab9db148403 Mon Sep 17 00:00:00 2001
984f77
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
984f77
Date: Wed, 7 Apr 2021 23:24:25 +0200
984f77
Subject: [PATCH] tests: make inverted tests actually count
984f77
MIME-Version: 1.0
984f77
Content-Type: text/plain; charset=UTF-8
984f77
Content-Transfer-Encoding: 8bit
984f77
984f77
"! test ..." does not cause the script to fail, even with set -e.
984f77
IIUC, bash treats this command as part of an expression line, as it
984f77
would if 'test ... && ...' was used. Failing expression lines do not
984f77
terminate the script.
984f77
984f77
This fixes the obvious cases by changing '! test' → 'test !'.
984f77
Then the inversion happens internally in test and bash will propagate
984f77
the failure.
984f77
984f77
(cherry picked from commit ffa328f060f437f3e1f0f0cb13513ee3dd9c3da5)
984f77
984f77
Related: #2087152
984f77
---
984f77
 test/TEST-22-TMPFILES/test-01.sh | 2 +-
984f77
 1 file changed, 1 insertion(+), 1 deletion(-)
984f77
984f77
diff --git a/test/TEST-22-TMPFILES/test-01.sh b/test/TEST-22-TMPFILES/test-01.sh
984f77
index d233e37fb2..b10b5aaa1a 100755
984f77
--- a/test/TEST-22-TMPFILES/test-01.sh
984f77
+++ b/test/TEST-22-TMPFILES/test-01.sh
984f77
@@ -10,4 +10,4 @@ rm -fr /tmp/test
984f77
 
984f77
 echo "e /tmp/test - root root 1d" | systemd-tmpfiles --create -
984f77
 
984f77
-! test -e /tmp/test
984f77
+test ! -e /tmp/test