zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity
lix/tests
History
aszlig 6567ab95a0
build-remote: Fix missing log output 
The storeUri variable in the build-remote hook is declared very much to
the start of the main function and a bunch of lines later, the same
variable gets checked via hasPrefix() but it gets assigned *after* that
check when the most suitable machine for the build was choosen.

So I guess this was just a typo in d16fd24973
and what we really want is to either checkd the prefix *after* assigning
storeUri or use bestMachine->storeUri directly.

I choose the latter, because the former could introduce even more
regressions if the try block where the variable gets assigned terminates
early.

Nevertheless, the reason why the log output didn't work is because
hasPrefix() checked for "ssh://" in front of storeUri, but if the
storeUri isn't set correctly (or at all), we don't get the log file
descriptor set up properly, leading to no log output.

I've adjusted the remote-builds test to include a regression test for
this, so that we can make sure we get a build output when using remote
builds.

In addition to that I've tested this with two of my build farms and the
build logs are emitted correctly again.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-25 01:34:18 +01:00
..
lang Revert "Don't parse "x:x" as a URI" 2017-11-14 15:10:52 +01:00
add.sh * Refactoring: remove unnecessary variables from the tests. 2011-10-10 21:32:34 +00:00
binary-cache.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
build-hook.nix build-remote: Add a basic test 2017-05-02 15:46:10 +02:00
build-remote.sh Allow shorter syntax for chroot stores 2017-10-24 15:32:38 +02:00
case-hack.sh Fix tests 2014-08-21 21:50:19 +02:00
case.nar Handle case collisions on case-insensitive systems 2014-07-16 16:02:05 +02:00
check-refs.nix Add disallowedReferences / disallowedRequisites 2014-08-28 18:57:13 +02:00
check-refs.sh Add disallowedReferences / disallowedRequisites 2014-08-28 18:57:13 +02:00
check-reqs.nix Add disallowedReferences / disallowedRequisites 2014-08-28 18:57:13 +02:00
check-reqs.sh Print out all bad references/requisites at once 2016-04-16 19:58:26 -04:00
common.sh.in Doh 2017-11-15 12:23:31 +01:00
config.nix Pass lists/attrsets to bash as (associative) arrays 2017-10-25 13:01:50 +02:00
dependencies.builder0.sh Test executables in NARs 2014-02-26 18:59:01 +01:00
dependencies.builder1.sh
dependencies.builder2.sh
dependencies.nix Test string semantics a bit more 2013-10-17 01:12:43 +02:00
dependencies.sh * Refactoring: remove unnecessary variables from the tests. 2011-10-10 21:32:34 +00:00
dump-db.sh Remove $NIX_DB_DIR 2016-08-10 18:05:35 +02:00
export-graph.nix Support quoted attribute names in -A 2013-11-18 10:21:12 +00:00
export-graph.sh Support quoted attribute names in -A 2013-11-18 10:21:12 +00:00
export.sh Don't put results symlinks in the tests directory 2012-09-11 19:14:15 -04:00
fetchGit.sh fetchGit/fetchMercurial: Fix directory inclusion check 2017-11-21 19:34:46 +01:00
fetchMercurial.sh fetchGit/fetchMercurial: Fix directory inclusion check 2017-11-21 19:34:46 +01:00
fetchurl.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
filter-source.nix Use shorter daemon socket path in tests 2016-03-24 14:45:55 +01:00
filter-source.sh Fix tests 2014-08-21 21:50:19 +02:00
fixed.builder1.sh
fixed.builder2.sh
fixed.nix
fixed.sh Support SHA-512 hashes 2015-11-04 16:37:49 +01:00
gc-concurrent.builder.sh
gc-concurrent.nix
gc-concurrent.sh Fix tests 2014-08-21 21:50:19 +02:00
gc-concurrent2.builder.sh
gc-runtime.nix
gc-runtime.sh Fix gc-runtime test 2016-09-12 13:40:07 +02:00
gc.sh Test nix-store -q --roots 2014-02-26 18:00:46 +01:00
hash-check.nix
hash.sh Support base-64 hashes 2017-07-04 15:07:41 +02:00
import-derivation.nix * Add a test for importing derivations. 2012-01-26 13:04:50 +00:00
import-derivation.sh Don't put results symlinks in the tests directory 2012-09-11 19:14:15 -04:00
init.sh Rename a few configuration options 2017-08-31 14:28:25 +02:00
install-darwin.sh Rename PINCH_ME_IM_SILLY to ALLOW_PREEXISTING_INSTALLATION 2017-07-14 12:11:33 -04:00
lang.sh Fix tests 2014-08-21 21:50:19 +02:00
linux-sandbox.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
local.mk Add tests for "nix run" 2017-11-20 18:36:36 +01:00
logging.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
misc.sh Output line number on infinite recursion 2015-07-31 20:26:44 +02:00
multiple-outputs.nix Don't put results symlinks in the tests directory 2012-09-11 19:14:15 -04:00
multiple-outputs.sh nix-shell/nix-build: Support .drv files again 2017-11-24 18:08:35 +01:00
nar-access.nix Rename tests/nar-index -> tests/nar-access 2017-11-14 13:27:40 +01:00
nar-access.sh nix ls-{nar,store}: Don't abort on missing files 2017-11-14 14:49:06 +01:00
nix-build.sh nix-shell/nix-build: Support .drv files again 2017-11-24 18:08:35 +01:00
nix-channel.sh Fix tests 2017-10-02 23:45:27 -04:00
nix-copy-closure.nix Disable the SSH substituter test for now 2016-05-31 11:48:05 +02:00
nix-profile.sh Fix nix-profile test in a chroot 2016-05-31 13:07:24 +02:00
nix-shell.sh nix-shell/nix-build: Support .drv files again 2017-11-24 18:08:35 +01:00
optimise-store.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
parallel.builder.sh Drop dependency on ‘expr’ 2014-02-06 13:51:57 +01:00
parallel.nix
parallel.sh Add support for ‘make installcheck’ 2013-11-25 18:47:03 +01:00
pass-as-file.sh Use $<attr>Path instead of $<attr> for passAsFile 2015-02-17 16:42:54 +01:00
placeholders.sh Add a mechanism for derivation attributes to reference the derivation's outputs 2016-08-17 17:19:32 +02:00
referrers.sh Remove $NIX_DB_DIR 2016-08-10 18:05:35 +02:00
remote-builds.nix build-remote: Fix missing log output 2017-11-25 01:34:18 +01:00
remote-store.sh Remove $NIX_DB_DIR 2016-08-10 18:05:35 +02:00
repair.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
restricted.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
run.nix Add tests for "nix run" 2017-11-20 18:36:36 +01:00
run.sh tests/run.sh: Fix /build conflict when building in a sandbox 2017-11-21 19:43:12 +01:00
secure-drv-outputs.nix * On FreeBSD, ‘touch’ is not in the test $PATH, so don't use it. 2011-08-08 14:08:38 +00:00
secure-drv-outputs.sh Remove manifest support 2016-04-11 16:20:15 +02:00
setuid.nix Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
shell.nix Fix nix-shell test 2017-04-25 18:59:18 +02:00
shell.shebang.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
signing.sh Add tests for verifying/copying content-addressed paths 2017-11-20 19:11:02 +01:00
simple.builder.sh
simple.nix
simple.sh Handle $TMPDIR ending with a slash 2016-10-19 15:19:38 +02:00
structured-attrs.nix exportReferencesGraph: Allow exporting a list of store paths 2017-10-25 15:18:49 +02:00
structured-attrs.sh Pass lists/attrsets to bash as (associative) arrays 2017-10-25 13:01:50 +02:00
tarball.sh Fix test failure 2016-09-08 18:22:28 +02:00
timeout.nix Replace Unicode quotes in user-facing strings by ASCII 2017-07-30 12:32:45 +01:00
timeout.sh Test: Replace --option with the corresponding flag 2017-11-20 17:50:49 +01:00
user-envs.builder.sh Test priorities 2012-12-04 14:47:50 +01:00
user-envs.nix Test priorities 2012-12-04 14:47:50 +01:00
user-envs.sh Remove $NIX_DB_DIR 2016-08-10 18:05:35 +02:00