Skip to content

BuildError: set exit status by default #15154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amaanq wants to merge 1 commit into from
Closed

BuildError: set exit status by default #15154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/libstore/build-result.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@

namespace nix {

unsigned int BuildError::exitCodeFromStatus(Status status)
{
ExitStatusFlags flags{};
flags.updateFromStatus(status);
return flags.failingExitStatus();
}

void ExitStatusFlags::updateFromStatus(BuildResult::Failure::Status status)
{
// Allow selecting a subset of enum values
Expand Down
13 changes: 10 additions & 3 deletions src/libstore/include/nix/store/build-result.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,22 @@ struct BuildError : public Error
*/
bool isNonDeterministic = false;

private:

/**
* Used in the constructors
*/
static unsigned int exitCodeFromStatus(Status status);

public:

/**
* Variadic constructor for throwing with format strings.
* Delegates to the string constructor after formatting.
*/
template<typename... Args>
BuildError(Status status, const Args &... args)
: Error(args...)
: Error(exitCodeFromStatus(status), args...)
, status{status}
{
}
Expand All @@ -97,10 +105,9 @@ public:
* Also used for deserialization.
*/
BuildError(Args args)
: Error(std::move(args.msg))
: Error(exitCodeFromStatus(args.status), std::move(args.msg))
, status{args.status}
, isNonDeterministic{args.isNonDeterministic}

{
}

Expand Down
2 changes: 1 addition & 1 deletion tests/functional/timeout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ expectStderr 101 nix-build timeout.nix -A silent --max-silent-time 2 | grepQuiet

expectStderr 100 nix-build timeout.nix -A closeLog | grepQuiet "builder failed due to signal"

expectStderr 1 nix build -f timeout.nix silent --max-silent-time 2 | grepQuiet "timed out after 2 seconds"
expectStderr 101 nix build -f timeout.nix silent --max-silent-time 2 | grepQuiet "timed out after 2 seconds"
Loading