From 3ac5c0818073382eaaec5acca38925dcd8e4d52f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 12 Mar 2024 18:04:40 +0000
Subject: [PATCH] Have testrunner.tcl have each test store its temp files in
 its working directory. To avoid unlikely, but possible, collisions.

FossilOrigin-Name: 775a10d10b9bf2227071e778718ba4054d4b2b4238751eb147338d687b4e0d58
---
 manifest            | 15 +++++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl |  7 ++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 5731f2374e..e4db435c3e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\stestrunner.tcl\sproblem\son\swindows.
-D 2024-03-11T20:34:02.340
+C Have\stestrunner.tcl\shave\seach\stest\sstore\sits\stemp\sfiles\sin\sits\sworking\sdirectory.\sTo\savoid\sunlikely,\sbut\spossible,\scollisions.
+D 2024-03-12T18:04:40.495
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1687,7 +1687,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl fe617b88c7eb08bdf983d2aaa31c20fbf439eee7b8e0d61ca636fcd0c305bbbf
-F test/testrunner.tcl 283be0c85bd132136ed564a99227b946194c31a0658df43c22a5e86956b70b43
+F test/testrunner.tcl 9fb1341f4a3fcc169b0cffa2f319abde197a738d98131d178a81509a0638f2df
 F test/testrunner_data.tcl 7ffd951527bbc614e723fd8d123b6834321878530696adecfdf6035100bac64e
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2177,8 +2177,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1f5e334d98d98cd90a2fb53502015a883d96fed05c04c1c3e1e78c302bede50f
-R 3329f7728eccdd894e074db61e3ec3e5
+P 7805844bc4433ae088dae6d54eb972e082c5a3df06e844cfc8b69e7d97aeb432
+R 9fe0d14be342ac1becb45016c9700f68
+T *branch * testrunner-tmpdir-fix
+T *sym-testrunner-tmpdir-fix *
+T -sym-trunk *
 U dan
-Z 4fb36ca27e18f07178be9aab3a444f9c
+Z 7a40c29cf47919cba49700f99392c55a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cf0788db21..1af80e0611 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7805844bc4433ae088dae6d54eb972e082c5a3df06e844cfc8b69e7d97aeb432
\ No newline at end of file
+775a10d10b9bf2227071e778718ba4054d4b2b4238751eb147338d687b4e0d58
\ No newline at end of file
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index daf7457170..7dbfc251de 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -994,6 +994,11 @@ proc launch_another_job {iJob} {
     close $fd
   }
 
+  set job_cmd $job(cmd)
+  if {$TRG(platform)!="win"} {
+    set job_cmd "export SQLITE_TMPDIR=\"[file normalize $dir]\"\n$job_cmd"
+  }
+
   if { $TRG(dryrun) } {
 
     mark_job_as_finished $job(jobid) "" done 0
@@ -1008,7 +1013,7 @@ proc launch_another_job {iJob} {
     set pwd [pwd]
     cd $dir
     set fd [open $TRG(run) w]
-    puts $fd $job(cmd) 
+    puts $fd $job_cmd
     close $fd
     set fd [open "|$TRG(runcmd) 2>@1" r]
     cd $pwd
-- 
2.39.5