When generating make.sh for testrunner, correctly quote the value of any options passed via environment variable OPTS.

dan · dan · commit df3e207501fa · 2026-04-09T06:38:31.000Z
FossilOrigin-Name: 0837933b49f5fc5590f2052808bc305aceccafbf5db65aae250c594ce48d4d32
diff --git a/manifest b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuffer\soverflow\sbug\sin\sa\srecent\scheck-in,\sreported\sby\sunsolicted\nemail\sfrom\sOpenAI/Codex.
-D 2026-04-08T17:00:33.995
+C When\sgenerating\smake.sh\sfor\stestrunner,\scorrectly\squote\sthe\svalue\sof\sany\soptions\spassed\svia\senvironment\svariable\sOPTS.
+D 2026-04-09T06:38:31.158
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1715,7 +1715,7 @@ F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3f
 F test/tester.tcl 2d943f60200e0a36bcd3f1f0baf181a751cd3604ef6b6bd4c8dc39b4e8a53116
 F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
 F test/testrunner.tcl 6b232f0d4825dec8b967754503080fc9609fad077f582d02f86bd2d95bec4110 x
-F test/testrunner_data.tcl 078e251983c8fc573567125147655f68132210f226c92922daf21fb913779717
+F test/testrunner_data.tcl 48c8a230fcada37f4809f95c2ba49e44bc3d520b6165c09173249c6e65b01cc1
 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2197,8 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 025abd4cf409fb9938e116289f23dc5bcd6d14feb46066221e691b146ee9b354
-R 7600f47bef4b02dcc59e25059aaa900d
-U drh
-Z c818e025424851b4793e1d43a62d77e7
+P be891a137af15897691250324e4d3d9c96f0c5fb414bca27d0c3bfdd3012a8a2
+R c24b551dbd250f5d7cc88469c80359bc
+U dan
+Z 93e98525b13ec0438aae52ba18e2c764
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
@@ -1 +1 @@
-be891a137af15897691250324e4d3d9c96f0c5fb414bca27d0c3bfdd3012a8a2
+0837933b49f5fc5590f2052808bc305aceccafbf5db65aae250c594ce48d4d32
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
@@ -481,7 +481,7 @@ proc make_sh_script {srcdir opts cflags makeOpts configOpts} {
   set myopts ""
   if {[info exists ::env(OPTS)]} {
     append myopts "# From environment variable:\n"
-    append myopts "OPTS=$::env(OPTS)\n\n"
+    append myopts "OPTS=\"$::env(OPTS)\"\n\n"
   }
   foreach o [lsort $opts] { 
     append myopts "OPTS=\"\$OPTS $o\"\n"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-be891a137af15897691250324e4d3d9c96f0c5fb414bca27d0c3bfdd3012a8a2`
	`1`	`+0837933b49f5fc5590f2052808bc305aceccafbf5db65aae250c594ce48d4d32`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ proc make_sh_script {srcdir opts cflags makeOpts configOpts} {`
`481`	`481`	`set myopts ""`
`482`	`482`	`if {[info exists ::env(OPTS)]} {`
`483`	`483`	`append myopts "# From environment variable:\n"`
`484`		`- append myopts "OPTS=$::env(OPTS)\n\n"`
	`484`	`+ append myopts "OPTS=\"$::env(OPTS)\"\n\n"`
`485`	`485`	`}`
`486`	`486`	`foreach o [lsort $opts] {`
`487`	`487`	`append myopts "OPTS=\"\$OPTS $o\"\n"`