threads / patch / 40893

patchtest_must_fail: compare exit_code using integer -eq operator

Subject: [PATCH] test_must_fail: compare exit_code using integer -eq operator

## tl;dr

2 messages between Nov 25, 2015 and Nov 28, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ramsay Jones· Nov 25, 2015, 22:05 UTC · lore
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Jeff,
Can we squash this into your fixup?

ATB, Ramsay Jones

 t/test-lib-functions.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Show changes to t/test-lib-functions.sh +4 −4
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 85aeaf9..2bb639e 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -605,22 +605,22 @@ test_must_fail () {
 	esac
 	"$@"
 	exit_code=$?
-	if test $exit_code = 0 && ! test_list_contains "$_test_ok" success
+	if test $exit_code -eq 0 && ! test_list_contains "$_test_ok" success
 	then
 		echo >&2 "test_must_fail: command succeeded: $*"
 		return 1
-	elif test $exit_code = 141 && test_list_contains "$_test_ok" sigpipe
+	elif test $exit_code -eq 141 && test_list_contains "$_test_ok" sigpipe
 	then
 		return 0
 	elif test $exit_code -gt 129 && test $exit_code -le 192
 	then
 		echo >&2 "test_must_fail: died by signal: $*"
 		return 1
-	elif test $exit_code = 127
+	elif test $exit_code -eq 127
 	then
 		echo >&2 "test_must_fail: command not found: $*"
 		return 1
-	elif test $exit_code = 126
+	elif test $exit_code -eq 126
 	then
 		echo >&2 "test_must_fail: valgrind error: $*"
 		return 1
-- 
2.6.0
Jeff King· Nov 28, 2015, 16:58 UTC · re: Ramsay Jones · lore

Re: [PATCH] test_must_fail: compare exit_code using integer -eq operator

On Wed, Nov 25, 2015 at 10:05:24PM +0000, Ramsay Jones wrote:
> Hi Jeff,
> 
> Can we squash this into your fixup?

I think it's a good thing to do, but I had figured it could be a separate patch (especially since it is touching lines that are otherwise unchanged by the patch). Looks like Lars folded it into his patch, though, and I am OK with that, too.

-Peff

← back to recent threads