From 4c1366f389d8691a82db120e54a213747e0b4647 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 29 Sep 2018 18:56:35 -0400 Subject: test: Normalize on "status" instead of "stat" "ret" or "r" for storing exit codes The name "status" was chosen because BATS initializes status=0; if we switch from Roundup to BATS, our common setup won't need set it anymore. Accomplish this with: $ sed -ri -e 's/\$(stat|ret|r)\b/$status/g' -e 's/\b(stat|ret|r)=/status=/g' test/*.sh $ sed -ri '/^\s*(local\s+)?status=0$/d' test/*-test.sh --- test/librerelease-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/librerelease-test.sh') diff --git a/test/librerelease-test.sh b/test/librerelease-test.sh index 6e2b42d..86da995 100644 --- a/test/librerelease-test.sh +++ b/test/librerelease-test.sh @@ -60,9 +60,9 @@ it_fails_if_gpgkey_not_set() { "$WORKDIR/staging/repo2/file with spaces" \ "$WORKDIR/staging/repo2/sub/subfolder" unset WORKDIR - LC_ALL=C librerelease -l >"$tmpdir/stdout" 2>"$tmpdir/stderr" || stat=$? + LC_ALL=C librerelease -l >"$tmpdir/stdout" 2>"$tmpdir/stderr" || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty "$tmpdir/stdout" grep GPGKEY "$tmpdir/stderr" } -- cgit v1.2.2