From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v3 0/5] Enable GPG in the Windows part of the CI/PR builds
Date: Thu, 26 Mar 2020 15:35:23 +0000 [thread overview]
Message-ID: <pull.728.v3.git.git.1585236929.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.728.v2.git.git.1585114881.gitgitgadget@gmail.com>
While debugging the breakages introduced by hi/gpg-prefer-check-signature, I
noticed that the GPG prereq was not available on Windows, even if Git for
Windows' SDK comes with a fully functional GPG2.
The fix was easy, but finding out what was going on was not, so for good
measure, the fix is accompanied by a patch that will hopefully make future
investigations into GPG-related problems much, much easier.
Changes since v2:
* Reordered 4/5 before 3/5, as I had intended originally.
* Renamed _trace_level to have a trailing underscore, in line with the
surrounding code.
* Added a note to the commit message why only lib-gpg.sh loses its
hash-bang line, and no other files in t/.
Changes since v1:
* The prereqs are now lazy ones.
* A new patch was introduced to make tracing via -x work even with those
inter-dependent prereqs.
* The test-signing's stdout is redirected to /dev/null because it is
unreadable and unhelpful binary gibberish, anyway. (This imitates Peff's
patch.)
Johannes Schindelin (5):
tests(gpg): allow the gpg-agent to start on Windows
t/lib-gpg.sh: stop pretending to be a stand-alone script
tests: do not let lazy prereqs inside `test_expect_*` turn off tracing
tests: turn GPG, GPGSM and RFC1991 into lazy prereqs
tests: increase the verbosity of the GPG-related prereqs
t/lib-gpg.sh | 110 ++++++++++++++++++++++++++---------------------
t/t0000-basic.sh | 13 ++++++
t/test-lib.sh | 6 ++-
3 files changed, 77 insertions(+), 52 deletions(-)
base-commit: 30e9940356dc67959877f4b2417da33ebdefbb79
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-728%2Fdscho%2Fci-windows-gpg-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-728/dscho/ci-windows-gpg-v3
Pull-Request: https://github.com/git/git/pull/728
Range-diff vs v2:
1: 287a21f1033 = 1: 287a21f1033 tests(gpg): allow the gpg-agent to start on Windows
2: c1811d54190 ! 2: b4217c36070 t/lib-gpg.sh: stop pretending to be a stand-alone script
@@ -5,6 +5,10 @@
It makes no sense to call `./lib-gpg.sh`. Therefore the hash-bang line
is unnecessary.
+ There are other similar instances in `t/`, but they are too far from the
+ context of the enclosing patch series, so they will be addressed
+ separately.
+
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
4: 0767c8b77c8 ! 3: f35830c0eba tests: do not let lazy prereqs inside `test_expect_*` turn off tracing
@@ -60,7 +60,7 @@
fi
}
-+_trace_level=0
++trace_level_=0
want_trace () {
test "$trace" = t && {
test "$verbose" = t || test "$verbose_log" = t
@@ -69,7 +69,7 @@
# Do not add anything extra (including LF) after '$*'
eval "
- want_trace && set -x
-+ want_trace && _trace_level=$(($_trace_level+1)) && set -x
++ want_trace && trace_level_=$(($trace_level_+1)) && set -x
$*"
}
@@ -78,8 +78,8 @@
if want_trace
then
- set +x
-+ test 1 = $_trace_level && set +x
-+ _trace_level=$(($_trace_level-1))
++ test 1 = $trace_level_ && set +x
++ trace_level_=$(($trace_level_-1))
fi
} 2>/dev/null 4>&2
3: 85457a7b618 = 4: f69f97e24ba tests: turn GPG, GPGSM and RFC1991 into lazy prereqs
5: 5e89b512513 = 5: 064f4e541b8 tests: increase the verbosity of the GPG-related prereqs
--
gitgitgadget
next prev parent reply other threads:[~2020-03-26 15:35 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 13:09 [PATCH 0/2] Enable GPG in the Windows part of the CI/PR builds Johannes Schindelin via GitGitGadget
2020-03-23 13:09 ` [PATCH 1/2] tests(gpg): allow the gpg-agent to start on Windows Johannes Schindelin via GitGitGadget
2020-03-23 17:46 ` Junio C Hamano
2020-03-24 19:55 ` Johannes Schindelin
2020-03-24 20:59 ` Junio C Hamano
2020-03-24 22:26 ` Johannes Schindelin
2020-03-24 23:40 ` Junio C Hamano
2020-03-23 13:09 ` [PATCH 2/2] tests(gpg): increase verbosity to allow debugging Johannes Schindelin via GitGitGadget
2020-03-23 17:32 ` Jeff King
2020-03-23 18:04 ` Jeff King
2020-03-23 19:21 ` Junio C Hamano
2020-03-23 20:15 ` Jeff King
2020-03-23 21:28 ` Junio C Hamano
2020-03-23 21:31 ` Jeff King
2020-03-24 21:41 ` Johannes Schindelin
2020-03-24 22:05 ` Jeff King
2020-03-24 22:25 ` Johannes Schindelin
2020-03-24 22:33 ` Jeff King
2020-03-25 5:41 ` [PATCH v2 0/5] Enable GPG in the Windows part of the CI/PR builds Johannes Schindelin via GitGitGadget
2020-03-25 5:41 ` [PATCH v2 1/5] tests(gpg): allow the gpg-agent to start on Windows Johannes Schindelin via GitGitGadget
2020-03-25 5:41 ` [PATCH v2 2/5] t/lib-gpg.sh: stop pretending to be a stand-alone script Johannes Schindelin via GitGitGadget
2020-03-26 8:21 ` Jeff King
2020-03-26 13:48 ` Johannes Schindelin
2020-03-26 19:31 ` Junio C Hamano
2020-03-25 5:41 ` [PATCH v2 3/5] tests: turn GPG, GPGSM and RFC1991 into lazy prereqs Johannes Schindelin via GitGitGadget
2020-03-25 17:25 ` Junio C Hamano
2020-03-26 8:35 ` Jeff King
2020-03-26 14:27 ` Johannes Schindelin
2020-03-27 9:10 ` Jeff King
2020-03-27 17:44 ` Junio C Hamano
2020-03-27 20:24 ` Eric Sunshine
2020-03-27 21:37 ` Junio C Hamano
2020-03-28 10:58 ` Jeff King
2020-03-28 10:54 ` Jeff King
2020-03-28 23:49 ` [PATCH v2] t/README: suggest how to leave test early with failure Junio C Hamano
2020-03-29 7:23 ` Eric Sunshine
2020-03-29 14:33 ` Jeff King
2020-03-30 18:39 ` [PATCH v2 3/5] tests: turn GPG, GPGSM and RFC1991 into lazy prereqs Johannes Schindelin
2020-03-31 9:34 ` Jeff King
2020-03-25 5:41 ` [PATCH v2 4/5] tests: do not let lazy prereqs inside `test_expect_*` turn off tracing Johannes Schindelin via GitGitGadget
2020-03-25 17:23 ` Junio C Hamano
2020-03-26 13:45 ` Johannes Schindelin
2020-03-26 8:49 ` Jeff King
2020-03-26 14:34 ` Johannes Schindelin
2020-03-25 5:41 ` [PATCH v2 5/5] tests: increase the verbosity of the GPG-related prereqs Johannes Schindelin via GitGitGadget
2020-03-26 8:50 ` Jeff King
2020-03-26 14:36 ` Johannes Schindelin
2020-03-26 15:35 ` Johannes Schindelin via GitGitGadget [this message]
2020-03-26 15:35 ` [PATCH v3 1/5] tests(gpg): allow the gpg-agent to start on Windows Johannes Schindelin via GitGitGadget
2020-03-26 15:35 ` [PATCH v3 2/5] t/lib-gpg.sh: stop pretending to be a stand-alone script Johannes Schindelin via GitGitGadget
2020-03-26 15:35 ` [PATCH v3 3/5] tests: do not let lazy prereqs inside `test_expect_*` turn off tracing Johannes Schindelin via GitGitGadget
2020-03-26 15:35 ` [PATCH v3 4/5] tests: turn GPG, GPGSM and RFC1991 into lazy prereqs Johannes Schindelin via GitGitGadget
2020-03-26 15:35 ` [PATCH v3 5/5] tests: increase the verbosity of the GPG-related prereqs Johannes Schindelin via GitGitGadget
2020-03-27 9:12 ` [PATCH v3 0/5] Enable GPG in the Windows part of the CI/PR builds Jeff King
2020-03-27 17:45 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.728.v3.git.git.1585236929.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).