| Message ID | cover.1699596457.git.ps@pks.im (mailing list archive) |
|---|---|
| Headers | show |
| Series | t: improve compatibility with NixOS | expand |
On Fri, Nov 10, 2023 at 09:16:56AM +0100, Patrick Steinhardt wrote: > this is the fourth version of my patch series to improve compatibility > of our test suite with NixOS. > > Three changes compared to v3: > > - Switched from `test <expr> -a <expr>` to `test <expr> && test > <expr>`. > > - Improved the commit message to explain why the new > runtime-detected paths are only used as a fallback. > > - Rebased on top of 0e3b67e2aa (ci: add support for GitLab CI, > 2023-11-09), which has been merged to `next` and caused conflicts. Thanks, these all look good to me. -Peff
Patrick Steinhardt <ps@pks.im> writes: > Three changes compared to v3: > > - Switched from `test <expr> -a <expr>` to `test <expr> && test > <expr>`. > > - Improved the commit message to explain why the new > runtime-detected paths are only used as a fallback. > > - Rebased on top of 0e3b67e2aa (ci: add support for GitLab CI, > 2023-11-09), which has been merged to `next` and caused conflicts. Please, no. "The other topic has been merged to 'next'" is *not* a good reason to do this. Before that, the other topic was in 'seen' and causing conflicts already, so getting into 'next' did not create any new reason for rebasing. I'll manage this time, but please do not do such a rebase unless you are asked to do so. The rebase will force me to do (1) detach from 'next' and apply these, (2) discard the result and detach from the base of where the previous iteration is queued, (3) apply the new iteration with "am -3" to undo the rebase, before I can compare the new iteration with the old iteration. > Technically speaking this series also depends on 0763c3a2c4 (http: > update curl http/2 info matching for curl 8.3.0, 2023-09-15), without > which the tests will fail on NixOS machines with a recent libcurl. Thanks for that note. This topic has been queued on top of v2.43.0-rc1 which has 0763c3a2c4, so we'd be safe. Will queue.
On Sat, Nov 11, 2023 at 09:10:23AM +0900, Junio C Hamano wrote: > Patrick Steinhardt <ps@pks.im> writes: > > > Three changes compared to v3: > > > > - Switched from `test <expr> -a <expr>` to `test <expr> && test > > <expr>`. > > > > - Improved the commit message to explain why the new > > runtime-detected paths are only used as a fallback. > > > > - Rebased on top of 0e3b67e2aa (ci: add support for GitLab CI, > > 2023-11-09), which has been merged to `next` and caused conflicts. > > Please, no. "The other topic has been merged to 'next'" is *not* a > good reason to do this. Before that, the other topic was in 'seen' > and causing conflicts already, so getting into 'next' did not create > any new reason for rebasing. > > I'll manage this time, but please do not do such a rebase unless you > are asked to do so. The rebase will force me to do (1) detach from > 'next' and apply these, (2) discard the result and detach from the > base of where the previous iteration is queued, (3) apply the new > iteration with "am -3" to undo the rebase, before I can compare the > new iteration with the old iteration. Fair enough. I assumed that it would ease your workload instead of creating more work for you. But I'll keep in mind that it doesn't and refrain from doing this in the future. > > Technically speaking this series also depends on 0763c3a2c4 (http: > > update curl http/2 info matching for curl 8.3.0, 2023-09-15), without > > which the tests will fail on NixOS machines with a recent libcurl. > > Thanks for that note. This topic has been queued on top of > v2.43.0-rc1 which has 0763c3a2c4, so we'd be safe. > > Will queue. Thanks. Patrick
Patrick Steinhardt <ps@pks.im> writes: > Fair enough. I assumed that it would ease your workload instead of > creating more work for you. But I'll keep in mind that it doesn't and > refrain from doing this in the future. Thanks. With or without conflicts, basing your work on 'next' would not be a good idea to begin with, as we never merge 'next' down to 'master' (we only merge individual topics). The following applies not specifically to you but to all contributors. What is helpful is in a tricky case is to start your topic branch development at an appropriate base (often the tip of 'master', but for a bugfix the tip of 'maint'), merge in other topics in flight you depend on that are not in the target base (which limits what you can depend on if you are writing a bugfix on 'maint'), and then start building on top of the merge result. Then communicate how you built this (artificial) base clearly in your cover letter. Whether you have "other topics in flight" merged to your base or not, creating a trial merge of your topic to seen to see how others' work-in-progress may interact with your work would be a valuable way to keep aware of what is cooking and how you will be affected. Thanks.
Hi, this is the fourth version of my patch series to improve compatibility of our test suite with NixOS. Three changes compared to v3: - Switched from `test <expr> -a <expr>` to `test <expr> && test <expr>`. - Improved the commit message to explain why the new runtime-detected paths are only used as a fallback. - Rebased on top of 0e3b67e2aa (ci: add support for GitLab CI, 2023-11-09), which has been merged to `next` and caused conflicts. Technically speaking this series also depends on 0763c3a2c4 (http: update curl http/2 info matching for curl 8.3.0, 2023-09-15), without which the tests will fail on NixOS machines with a recent libcurl. Patrick Patrick Steinhardt (3): t/lib-httpd: dynamically detect httpd and modules path t/lib-httpd: stop using legacy crypt(3) for authentication t9164: fix inability to find basename(1) in Subversion hooks t/lib-httpd.sh | 17 +++++++++++++---- t/lib-httpd/passwd | 2 +- t/lib-httpd/proxy-passwd | 2 +- t/t9164-git-svn-dcommit-concurrent.sh | 9 ++++++++- 4 files changed, 23 insertions(+), 7 deletions(-) Range-diff against v3: 1: e4c75c492dd ! 1: 41b9dada2e0 t/lib-httpd: dynamically detect httpd and modules path @@ Commit message - The module directory can (in many cases) be derived via the `HTTPD_ROOT` compile-time variable. - Amend the code to do so. The new runtime-detected paths will only be - used in case none of the hardcoded paths are usable. + Amend the code to do so. + + Note that the new runtime-detected paths will only be used as a fallback + in case none of the hardcoded paths are usable. For the PATH lookup this + is because httpd is typically installed into "/usr/sbin", which is often + not included in the user's PATH variable. And the module path detection + relies on a configured httpd installation and may thus not work in all + cases, either. Signed-off-by: Patrick Steinhardt <ps@pks.im> @@ t/lib-httpd.sh: fi + "$(command -v apache2)" do - if test -x "$DEFAULT_HTTPD_PATH" -+ if test -n "$DEFAULT_HTTPD_PATH" -a -x "$DEFAULT_HTTPD_PATH" ++ if test -n "$DEFAULT_HTTPD_PATH" && test -x "$DEFAULT_HTTPD_PATH" then break fi @@ t/lib-httpd.sh: fi '/usr/lib/apache2/modules' \ '/usr/lib64/httpd/modules' \ '/usr/lib/httpd/modules' \ -- '/usr/libexec/httpd' -+ '/usr/libexec/httpd' \ + '/usr/libexec/httpd' \ +- '/usr/lib/apache2' ++ '/usr/lib/apache2' \ + "${DETECTED_HTTPD_ROOT:+${DETECTED_HTTPD_ROOT}/modules}" do - if test -d "$DEFAULT_HTTPD_MODULE_PATH" -+ if test -n "$DEFAULT_HTTPD_MODULE_PATH" -a -d "$DEFAULT_HTTPD_MODULE_PATH" ++ if test -n "$DEFAULT_HTTPD_MODULE_PATH" && test -d "$DEFAULT_HTTPD_MODULE_PATH" then break fi 2: 3dce76da477 = 2: 7d28c32feaa t/lib-httpd: stop using legacy crypt(3) for authentication 3: 6891e254155 = 3: 6a7773aadba t9164: fix inability to find basename(1) in Subversion hooks base-commit: 0e3b67e2aa25edb7e1a5c999c87b52a7b3a7649a