Fix testrunner.tcl so that it can detect the number of logical cores on osx.

FossilOrigin-Name: 14918f28221a3124b78a490fbb483279551ccc5a0032ea854ff0ac365684cc60

diff --git a/manifest b/manifest
index 93534498fbb1b1169a693688824f0db6c1dfe7d0..4f0f66658418cf7e6b5590ae1c88ed2cebc2bd1f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schange\sto\shelp\smessage\sin\stestrunner.tcl.
-D 2022-07-13T21:10:11.168
+C Fix\stestrunner.tcl\sso\sthat\sit\scan\sdetect\sthe\snumber\sof\slogical\scores\son\sosx.
+D 2022-07-13T21:28:19.394
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1507,7 +1507,7 @@ F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 76771269dcc20b2c2d1d6f1175dd50d1eebddc004aebac865483f1829a5cd398
-F test/testrunner.tcl 10b2f2c9c029dc611c6a34215edf29174397370b5c9e2df7a40e5560933bffe4
+F test/testrunner.tcl da340a87fd8b5c94e0d2196b086b96a90de0ce16bfdb71c1254d543bcee1614a
 F test/testset.tcl 27a6bbbc93cbbcf442c57e3c023e6b5d7304dc415e09eb0e9ac61edd0e6c1fbe
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
@@ -1981,8 +1981,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 0122e93dc19c228546908b9ef5c58f88d27d79233523e2d09a4bbd56b0c492f9
-R 7e269f5dfdef1a9282f328f55b519c5c
+P e4f9cb01d790c27394cc021e7d4a16f4d5feda2d2493abd82e9660d7e6e9fec0
+R 9a0d40a26ff73e3e7c23af9cf6fe1abf
 U dan
-Z 246b3b776865c8a91afa511145e5ca7c
+Z 0c6e6152833b38a594a27d8bd483ee08
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 5ff7c89e01d1faafe590b8567fb1d8ca9b4fee6d..b38d313dcb6c3fab5be4195e96400395ad6e529c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4f9cb01d790c27394cc021e7d4a16f4d5feda2d2493abd82e9660d7e6e9fec0
\ No newline at end of file
+14918f28221a3124b78a490fbb483279551ccc5a0032ea854ff0ac365684cc60
\ No newline at end of file

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index dfdc0a5960e1db4c554b86699f60cba3e4025713..568c5991367555757b7a3305c7702e70ba01529a 100644 (file)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -62,8 +62,14 @@ set R(schema) {
 #
 proc guess_number_of_cores {} {
   set ret 4
+  
+  if {$::tcl_platform(os)=="Darwin"} {
+    set cmd "sysctl -n hw.logicalcpu"
+  } else {
+    set cmd "nproc"
+  }
   catch {
-    set fd [open "|nproc" r]
+    set fd [open "|$cmd" r]
     set ret [gets $fd]
     close $fd
     set ret [expr $ret]