From f8fb070a378fe7883982774abd2d3b122ae86632 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Sat, 2 Mar 2024 07:26:34 +0100
Subject: [PATCH] tests: Fix meson log printing in run-nix

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.
---
 tests/run-nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/run-nix b/tests/run-nix
index eb54449..b23f19d 100755
--- a/tests/run-nix
+++ b/tests/run-nix
@@ -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"