Fix a typo in testrunner_data.tcl that prevented --with-tcl specifications

from being carried through into sub-builds.  Adjust test cases to account
for new floating-point differences discovered when --with-tcl was fixed.

FossilOrigin-Name: b8f81351914deac99b14be6bb5e4096c1efed9bdb057750825760f09dae04656

diff --git a/manifest b/manifest
index 8ae09e848d1aaff8076e3c9eabd6bc04671671b4..a82aeee2920dc9812d08d905affb19e2736eb87c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sobsolete\stestfixture\sTCL\scommands\sformerly\srequired\sby\sWindows\nbut\snow\shandled\sby\sTcl\sitself.\s\sUpdate\stests\scase\saccordingly.
-D 2024-07-31T15:04:37.311
+C Fix\sa\stypo\sin\stestrunner_data.tcl\sthat\sprevented\s--with-tcl\sspecifications\nfrom\sbeing\scarried\sthrough\sinto\ssub-builds.\s\sAdjust\stest\scases\sto\saccount\nfor\snew\sfloating-point\sdifferences\sdiscovered\swhen\s--with-tcl\swas\sfixed.
+D 2024-07-31T16:37:02.026
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1248,7 +1248,7 @@ F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab
 F test/func4.test a3f9062487dbd826776f54f4e0e9517fe8c3cf689af92735308965774d51fac5
 F test/func5.test 863e6d1bd0013d09c17236f8a13ea34008dd857d87d85a13a673960e4c25d82a
 F test/func6.test 3bc89ec0f2605736d3a118f43d25ef58115a7db4dba8ae939a363917d815c0bb
-F test/func7.test 38d882ca14f3ec178b50d9354e6bb092c7dc8e1c30c9e4ac62b8f3e6a0b6a7d9
+F test/func7.test 7e009275f52c52954c8c028fdb62f8bc16cc47276fcc8753c1d2b22c6e074598
 F test/func8.test c4e2ecacf9f16e47a245e7a25fbabcc7e78f9c7c41a80f158527cdfdc6dd299d
 F test/func9.test b32d313f679aa9698d52f39519d301c3941823cb72b4e23406c210eadd82c824
 F test/fuzz-oss1.test 514dcabb24687818ea949fa6760229eaacad74ca70157743ef36d35bbe01ffb0
@@ -1706,7 +1706,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 640106bf8f7785d0ac67cda2837577eb9f2d936033bacedf9e705ca5451958ef
 F test/testrunner.tcl 757f79c68f82cad563441d80f02c492465f51cf537336c7b719c3ef45f348911
-F test/testrunner_data.tcl 3d36660cfd55ea5e20e661e8f94c0520feebcb437848f9b98b33c483cc479c0c
+F test/testrunner_data.tcl c5ae2b1f9a99210b0600d002fb3af1fee350997cee9416551e83b93501360ebf
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2200,8 +2200,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d5523c77fd0bcdc8344971a116d6ce9657f2b6daddeb7d936cd7607163a36744
-R 84a489b31a0c3218dd037a53107529be
+P 4f065fb638b24b33283518af8ad55f28a49cfac4086fa5e4568e2f3a6814962d
+R 0eeaa8c9fa32916768afe9b85f481a38
 U drh
-Z c83bb23b49c74bc693e83c6e007c904e
+Z 0225a9df2e84c769557dd80358cb5fb8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 460e5dce4a0519f6c4365eabd04c08ea0ccde124..1ba77fbb64089690d1be6940b0a4dbf9408ac2fd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f065fb638b24b33283518af8ad55f28a49cfac4086fa5e4568e2f3a6814962d
+b8f81351914deac99b14be6bb5e4096c1efed9bdb057750825760f09dae04656

diff --git a/test/func7.test b/test/func7.test
index af1a2e02270f3f510efa1f582641453e35b39075..6026b557f5b64381d0fb9755d762fa308b6449a0 100644 (file)
--- a/test/func7.test
+++ b/test/func7.test
@@ -100,13 +100,13 @@ do_execsql_test func7-pg-300 {
    SELECT acos(1);
 } {0.0}
 do_execsql_test func7-pg-301 {
-   SELECT degrees(acos(0.5));
+   SELECT format('%f',degrees(acos(0.5)));
 } {60.0}
 do_execsql_test func7-pg-310 {
    SELECT round( asin(1), 7);
 } {1.5707963}
 do_execsql_test func7-pg-311 {
-   SELECT degrees( asin(0.5) );
+   SELECT format('%f',degrees( asin(0.5) ));
 } {30.0}
 do_execsql_test func7-pg-320 {
    SELECT round( atan(1), 7);

diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index f8f12d91a73956ed4b34dab15d3119af10572c8a..af480fc4cfbfd66545ce7ec694a8b6f0d805cd61 100644 (file)
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -486,7 +486,7 @@ proc make_sh_script {srcdir opts cflags makeOpts configOpts} {
     TCLDIR="$tcldir"
     
     if [ ! -f Makefile ] ; then
-      \$SRCDIR/configure --with-tcl=\$TCL $configOpts 
+      \$SRCDIR/configure --with-tcl=\$TCLDIR $configOpts 
     fi
     
     $myopts