From 3f80dc2d9328171c24db0524dcf129f625fd9639 Mon Sep 17 00:00:00 2001
From: Robin Munn <rmunn@pobox.com>
Date: Thu, 14 Mar 2024 10:57:13 -0500
Subject: [PATCH] Better location for LD_DEBUG env var

---
 Dockerfile                       | 1 -
 docker/scripts/build-and-test.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c5b0d537..49297c9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,6 @@ ENV DBVERSION=7000072
 ENV DBVERSIONPATH=/usr/lib/lfmerge/7000072
 ENV RUN_UNIT_TESTS=1
 ENV NUNIT_VERSION_MAJOR=3
-ENV LD_DEBUG=all
 # ENV TEST_SPEC=LfMerge.Core.Tests.Actions.SynchronizeActionTests.SynchronizeAction_CustomReferenceAtomicField_DoesNotThrowExceptionDuringSync
 
 FROM lfmerge-build-${DbVersion} AS lfmerge-build
diff --git a/docker/scripts/build-and-test.sh b/docker/scripts/build-and-test.sh
index 724c97cb..0ce3750a 100755
--- a/docker/scripts/build-and-test.sh
+++ b/docker/scripts/build-and-test.sh
@@ -29,6 +29,7 @@ if [ -n "$RUN_UNIT_TESTS" -a "$RUN_UNIT_TESTS" -ne 0 ]; then
 	echo "Running unit tests"
 	# dotnet test defaults to killing test processes after 100ms, which is way too short
 	export VSTEST_TESTHOST_SHUTDOWN_TIMEOUT=30000  # 30 seconds, please, since some of our tests can run very long
+	export LD_DEBUG=all
 	# Treat TEST_SPEC enviornment variable as a "contains" operation
 	if [ -n "$TEST_SPEC" ]; then
 		dotnet test --no-restore -l:"console;verbosity=normal" -l:nunit -c Release --filter "FullyQualifiedName~${TEST_SPEC}"