Fix exit code of --help and --version, and test them in CI #62618
Conversation
Corrects prior regression which caused ERROR output and exit code of 1.
There was a problem hiding this comment.
Looks good to me.
I have a test run on https://github.com/akien-mga/godot/actions/runs/2599518766 from before this PR but with CI checks added to try to confirm that it would actually mark the run as failing.
Seems to work:
Run ./bin/godot.linuxbsd.tools.64.llvm.san --version
4.0.alpha.custom_build.e458311a4
ERROR: Condition "!_start_success" is true. Returning: false
at: start (main/main.cpp:2089)
ERROR: Condition "!_start_success" is true.
at: cleanup (main/main.cpp:2936)
Error: Process completed with exit code 1.
| @@ -691,12 +691,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph | |||
| if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help | |||
|
|
|||
| show_help = true; | |||
| exit_code = OK; | |||
| exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code. | |||
There was a problem hiding this comment.
For the record we discussed this on chat, and chose to go with this hack using the pre-existing ERR_HELP (which nothing uses otherwise in the codebase) to convey the meaning of early exit but success.
It's not the prettiest but the whole main setup is pretty messy already and due a full refactor/rewrite, so in the meantime this is good enough because it's simple/non-intrusive.
|
Thanks! |
akien-mga
added
the
cherrypick:3.x
|
Cherry-picked for 3.5. Edit: Seems like I messed up locally and forgot to push this back then. Fixed on 2022-07-08 with 861e155 |
akien-mga
removed
the
cherrypick:3.x
Corrects prior regression from #62550, which caused
ERROR:output and exit code 1.Also invokes both
--helpand--versionin GitHub Actions to ensure exit code 0.