Use "sha256sum" on Windows #1566
Conversation
Integer checks are more clear for this kind of boolean variables, and the string checks should have used a single "=" anyway.
Quoting [1] for some background information: "MSYS2 consists of three subsystems and their corresponding package repositories, msys2, mingw32, and mingw64. The mingw subsystems provide native Windows programs and are the main focus of the project. These programs are built to co-operate well with other Windows programs, independently of the other subsystems. The msys2 subsystem provides an emulated mostly-POSIX-compliant environment for building software, package management, and shell scripting. These programs live in a virtual single-root filesystem (the root is the MSYS2 installation directory). Some effort is made to have the programs work well with native Windows programs, but it's not seamless. [...] Every subsystem has an associated "shell", which is essentially a set of environment variables that allow the subsystems to co-operate properly. These shells can be invoked using scripts in the MSYS2 installation directory or shortcuts in the Start menu. The scripts set the MSYSTEM variable and start a terminal emulator with bash. Bash in turn sources /etc/profile which sets the environment depending on the value of MSYSTEM." [1] https://sourceforge.net/p/msys2/wiki/MSYS2%20introduction/
| fi | cut -f 1 -d " " | ||
| } | ||
|
|
||
| calc_oid_file() { |
There was a problem hiding this comment.
I know that there wasn't documentation on calc_oid before, but adding documentation to both of these functions would be incredibly helpful 👍
There was a problem hiding this comment.
Sure, but could you be a bit more clear on what to document? I mean, should I basically just use the commit message and document why to use sha256sum on Windows, or do you want to have the pipe of commands itself documented?
There was a problem hiding this comment.
Sure, let's just document what these functions take in their argument and that they work on both macOS and Windows.
| sha256sum "$1" | ||
| else | ||
| shasum -a 256 "$1" | ||
| fi | cut -f 1 -d " " |
There was a problem hiding this comment.
I guess there is no reasonable nice way to have the decision between sha256sum and shasum once in the code? Maybe a sha256 function? I guess "eval" is too evil?!
There was a problem hiding this comment.
Good idea, I just introduced a test environment variable for that. Let's see if that works on CI.
|
@sschuberth The unit tests run clean on my Win7 box but the integration tests don't work. Should they? Plus, I can't find any output of the unit or integration tests in the appveyor logs. Should they be there? Maybe I am not looking at the right places - I am not familiar with appveyor. Thanks for working on the Windows CI check! 👍 |
"shasum" is a Perl script. Pure MSYS2, in contrast to Git for Windows, does not come with Perl by default, so fall back to using "sha256sum" on Windows in general.
|
@larsxschneider: that's an indication of a previous unclean test run. Just delete |
Yes, and they do on my machine as well as on CI.
Yes, see the same link as above. However, the test results do not show up on the tests tab yet as AppVeyor only supports a limited set of test result formats. We would first need to write some simple conversion script, but I wanted to leave that for later. |
|
Of course... the URL file. I should have read the error properly. Sorry. All but two integration tests pass on my local Windows box: However, that's probably related to some of my setup. If they pass on the CI that this is good enough I think. LGTM 👍 |
|
Let's do it! |
Some changes around using "sha256sum" instead of "shasum" on Windows, in particular on MSYS2.