From 1421420e862434321c46511a3152016e443dd479 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 9 Dec 2024 17:18:10 +0100
Subject: [PATCH] test: Move unusual-logging to run only in logging test case

---
 tests/functional/dependencies.nix            | 15 ---------------
 tests/functional/logging.sh                  |  3 +++
 tests/functional/logging/unusual-logging.nix | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 tests/functional/logging/unusual-logging.nix

diff --git a/tests/functional/dependencies.nix b/tests/functional/dependencies.nix
index d177f5b63..4ff29227f 100644
--- a/tests/functional/dependencies.nix
+++ b/tests/functional/dependencies.nix
@@ -33,20 +33,6 @@ let
     outputHash = "1dq9p0hnm1y75q2x40fws5887bq1r840hzdxak0a9djbwvx0b16d";
   };
 
-  unusual-logging = mkDerivation {
-    name = "unusual-logging";
-    buildCommand = ''
-      {
-        echo "@nix 1"
-        echo "@nix {}"
-        echo '@nix {"action": null}'
-        echo '@nix {"action": 123}'
-        echo '@nix ]['
-      } >&$NIX_LOG_FD
-      touch $out
-    '';
-  };
-
 in
 mkDerivation {
   name = "dependencies-top";
@@ -56,7 +42,6 @@ mkDerivation {
   input1_drv = input1;
   input2_drv = input2;
   input0_drv = input0;
-  unusual_logging_drv = unusual-logging;
   fod_input_drv = fod_input;
   meta.description = "Random test package";
 }
diff --git a/tests/functional/logging.sh b/tests/functional/logging.sh
index c026ac9c2..bbc1bac96 100755
--- a/tests/functional/logging.sh
+++ b/tests/functional/logging.sh
@@ -28,3 +28,6 @@ outp="$(nix-build -E \
 test -d "$outp"
 
 nix log "$outp"
+
+# Build works despite ill-formed structured build log entries.
+expectStderr 0 nix build -f ./logging/unusual-logging.nix --no-link | grepQuiet 'warning: Unable to handle a JSON message from the derivation builder:'
diff --git a/tests/functional/logging/unusual-logging.nix b/tests/functional/logging/unusual-logging.nix
new file mode 100644
index 000000000..ddb8aa530
--- /dev/null
+++ b/tests/functional/logging/unusual-logging.nix
@@ -0,0 +1,16 @@
+let
+  inherit (import ../config.nix) mkDerivation;
+in
+mkDerivation {
+  name = "unusual-logging";
+  buildCommand = ''
+    {
+      echo "@nix 1"
+      echo "@nix {}"
+      echo '@nix {"action": null}'
+      echo '@nix {"action": 123}'
+      echo '@nix ]['
+    } >&$NIX_LOG_FD
+    touch $out
+  '';
+}