nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Add '--rounds'. 

* nix/nix-daemon/guix-daemon.cc (GUIX_OPT_BUILD_ROUNDS): New macro.
(options): Add --rounds.
(parse_opt): Honor it.
* doc/guix.texi (Invoking guix-daemon): Document it.
This commit is contained in:
Ludovic Courtès 2015-12-13 19:08:20 +01:00
parent f3ff1da424
commit ecf84b7c48
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guix.texi
View File

@ -864,6 +864,12 @@ Allow at most @var{n} build jobs in parallel. The default value is
locally; instead, the daemon will offload builds (@pxref{Daemon Offload locally; instead, the daemon will offload builds (@pxref{Daemon Offload
Setup}), or simply fail. Setup}), or simply fail.
@item --rounds=@var{N}
Build each derivation @var{n} times in a row, and raise an error if
consecutive build results are not bit-for-bit identical. Note that this
setting can be overridden by clients such as @command{guix build}
(@pxref{Invoking guix build}).
@item --debug @item --debug
Produce debugging output. Produce debugging output.

15
nix/nix-daemon/guix-daemon.cc
View File

@ -80,6 +80,7 @@ builds derivations on behalf of its clients.");
#define GUIX_OPT_NO_BUILD_HOOK 14 #define GUIX_OPT_NO_BUILD_HOOK 14
#define GUIX_OPT_GC_KEEP_OUTPUTS 15 #define GUIX_OPT_GC_KEEP_OUTPUTS 15
#define GUIX_OPT_GC_KEEP_DERIVATIONS 16 #define GUIX_OPT_GC_KEEP_DERIVATIONS 16
#define GUIX_OPT_BUILD_ROUNDS 17
static const struct argp_option options[] = static const struct argp_option options[] =
{ {
@ -104,6 +105,8 @@ static const struct argp_option options[] =
n_("do not use the 'build hook'") }, n_("do not use the 'build hook'") },
{ "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0, { "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0,
n_("cache build failures") }, n_("cache build failures") },
{ "rounds", GUIX_OPT_BUILD_ROUNDS, "N", 0,
n_("build each derivation N times in a row") },
{ "lose-logs", GUIX_OPT_LOSE_LOGS, 0, 0, { "lose-logs", GUIX_OPT_LOSE_LOGS, 0, 0,
n_("do not keep build logs") }, n_("do not keep build logs") },
{ "disable-log-compression", GUIX_OPT_DISABLE_LOG_COMPRESSION, 0, 0, { "disable-log-compression", GUIX_OPT_DISABLE_LOG_COMPRESSION, 0, 0,
@ -189,6 +192,18 @@ parse_opt (int key, char *arg, struct argp_state *state)
case GUIX_OPT_CACHE_FAILURES: case GUIX_OPT_CACHE_FAILURES:
settings.cacheFailure = true; settings.cacheFailure = true;
break; break;
case GUIX_OPT_BUILD_ROUNDS:
{
char *end;
unsigned long n = strtoul (arg, &end, 10);
if (end != arg + strlen (arg))
{
fprintf (stderr, _("error: %s: invalid number of rounds\n"), arg);
exit (EXIT_FAILURE);
}
settings.set ("build-repeat", std::to_string (std::max (0UL, n - 1)));
break;
}
case GUIX_OPT_IMPERSONATE_LINUX_26: case GUIX_OPT_IMPERSONATE_LINUX_26:
settings.impersonateLinux26 = true; settings.impersonateLinux26 = true;
break; break;