Skip to content

Commit

Permalink
tests: Fix meson log printing in run-nix
Browse files Browse the repository at this point in the history
The meson logs are below /tmp/nix-build-* now.

Also drop the `nix-env -i cntr`. I don't know what it's for, and it
only seems to recreate some build environment.
  • Loading branch information
martinpitt committed Mar 2, 2024
1 parent 7c3ff2d commit f8fb070
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tests/run-nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ in pkgs.umockdev.overrideAttrs (attrs: {
})
EOG
[ -z "${DEBUG:-}" ] || nix-env -i cntr
if ! nix-build --keep-failed /tmp/default.nix; then
for log in /build/source/build/meson-logs/*; do
logdir=\$(find /tmp -name meson-logs -type d)
for log in "\$logdir"/*; do
[ -f "\$log" ] || break
echo "=== \$log ==="
cat "\$log"
Expand Down

0 comments on commit f8fb070

Please sign in to comment.