From: dan <Dan Kennedy>
Date: Wed, 13 Mar 2024 10:47:54 +0000 (+0000)
Subject: Have testrunner.tcl set SQLITE_TMPDIR on windows as well.
X-Git-Tag: version-3.46.0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3de08a6ee0eb5eeb3d5b0008946ea606dcd8eee3;p=thirdparty%2Fsqlite.git

Have testrunner.tcl set SQLITE_TMPDIR on windows as well.

FossilOrigin-Name: 64f4dad1f928716b8688c650d043f18afcc72ec78d990145c580e2b98905b919
---

diff --git a/manifest b/manifest
index ed93666844..2735ee46af 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C On\stestrunner.tcl:\s(1)\sAdd\sthe\s"help"\scommand.\s\s(2)\sAdd\sthe\s"script"\scommand\nto\sthe\shelp\smessage.\s\s(3)\sImprove\sthe\serror\smessage\sgenerated\sby\s"script"\swhen\nan\sincorrect\sCONFIG\soption\sis\sprovided.
-D 2024-03-13T00:37:37.096
+C Have\stestrunner.tcl\sset\sSQLITE_TMPDIR\son\swindows\sas\swell.
+D 2024-03-13T10:47:54.860
 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 7cd31694a52affd636284b3e74ec10213c60e247ec71f56e9061cf669f897105
+F test/testrunner.tcl 29b60469f0bd1aa717507e2ec7660128894914def0f058bb6752c9bdfe61bbaa
 F test/testrunner_data.tcl 2f94974e5e3a56af880be72f7a7fd239aa9d4ecf978625435fcc698319c927fa
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2177,8 +2177,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 18842d0d72048561312c2c83035c01253150e1fe1ff37160f266d24d41a01df3
-R a8f09c1fdaad1d594fe806932cdf9a66
-U drh
-Z 2fb114f4336505cce7dafa69e9c32517
+P 1b7f0be44036fb90d763eabae84b95734e766f8010b39122f8787189308a7fc1
+R 3f6a714f6a93dd220bd97ec3c31ac4b4
+U dan
+Z 4ab7e95a7dcf535e4920c95d1b703486
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dffe028c56..ee62c57213 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b7f0be44036fb90d763eabae84b95734e766f8010b39122f8787189308a7fc1
\ No newline at end of file
+64f4dad1f928716b8688c650d043f18afcc72ec78d990145c580e2b98905b919
\ No newline at end of file
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 163ddc01e0..f05b399e3a 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1008,9 +1008,14 @@ 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"
+  # Add a batch/shell file command to set the directory used for temp
+  # files to the test's working directory. Otherwise, tests that use
+  # large numbers of temp files (e.g. zipvfs), might generate temp 
+  # filename collisions.
+  if {$TRG(platform)=="win"} {
+    set set_tmp_dir "SET SQLITE_TMPDIR=[file normalize $dir]"
+  } else {
+    set set_tmp_dir "export SQLITE_TMPDIR=\"[file normalize $dir]\""
   }
 
   if { $TRG(dryrun) } {
@@ -1027,7 +1032,8 @@ proc launch_another_job {iJob} {
     set pwd [pwd]
     cd $dir
     set fd [open $TRG(run) w]
-    puts $fd $job_cmd
+    puts $fd $set_tmp_dir
+    puts $fd $job(cmd)
     close $fd
     set fd [open "|$TRG(runcmd) 2>@1" r]
     cd $pwd