mirror of
https://github.com/NixOS/nix
synced 2025-07-08 19:23:54 +02:00
Improved logging abstraction
This also gets rid of --log-type, since the nested log type isn't useful in a multi-threaded situation, and nobody cares about the "pretty" log type.
This commit is contained in:
parent
c879a20850
commit
41633f9f73
29 changed files with 394 additions and 456 deletions
|
@ -2,16 +2,7 @@ source common.sh
|
|||
|
||||
clearStore
|
||||
|
||||
# Produce an escaped log file.
|
||||
path=$(nix-build --log-type escapes -vv dependencies.nix --no-out-link 2> $TEST_ROOT/log.esc)
|
||||
|
||||
# Convert it to an XML representation.
|
||||
nix-log2xml < $TEST_ROOT/log.esc > $TEST_ROOT/log.xml
|
||||
|
||||
# Is this well-formed XML?
|
||||
if test "$xmllint" != "false"; then
|
||||
$xmllint --noout $TEST_ROOT/log.xml || fail "malformed XML"
|
||||
fi
|
||||
path=$(nix-build dependencies.nix --no-out-link)
|
||||
|
||||
# Test nix-store -l.
|
||||
[ "$(nix-store -l $path)" = FOO ]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue