Fossil SCM
Better runtime settings detection by the 'th1' test file.
Commit
d8d2222b91854e24e05df11046770ed27d6deb06
Parent
acbee54e8ba8a3b…
1 file changed
+4
+4
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -197,19 +197,23 @@ | ||
| 197 | 197 | proc is_tcl_usable_by_fossil {} { |
| 198 | 198 | fossil test-th-eval "hasfeature tcl" |
| 199 | 199 | if {$::RESULT ne "1"} {return 0} |
| 200 | 200 | fossil test-th-eval "setting tcl" |
| 201 | 201 | if {$::RESULT eq "1"} {return 1} |
| 202 | + fossil test-th-eval --open-config "setting tcl" | |
| 203 | + if {$::RESULT eq "1"} {return 1} | |
| 202 | 204 | return [info exists ::env(TH1_ENABLE_TCL)] |
| 203 | 205 | } |
| 204 | 206 | |
| 205 | 207 | # This procedure only returns non-zero if the TH1 hooks feature was enabled |
| 206 | 208 | # at compile-time and is now enabled at runtime. |
| 207 | 209 | proc are_th1_hooks_usable_by_fossil {} { |
| 208 | 210 | fossil test-th-eval "hasfeature th1Hooks" |
| 209 | 211 | if {$::RESULT ne "1"} {return 0} |
| 210 | 212 | fossil test-th-eval "setting th1-hooks" |
| 213 | + if {$::RESULT eq "1"} {return 1} | |
| 214 | + fossil test-th-eval --open-config "setting th1-hooks" | |
| 211 | 215 | if {$::RESULT eq "1"} {return 1} |
| 212 | 216 | return [info exists ::env(TH1_ENABLE_HOOKS)] |
| 213 | 217 | } |
| 214 | 218 | |
| 215 | 219 | # This (rarely used) procedure is designed to run a test within the Fossil |
| 216 | 220 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -197,19 +197,23 @@ | |
| 197 | proc is_tcl_usable_by_fossil {} { |
| 198 | fossil test-th-eval "hasfeature tcl" |
| 199 | if {$::RESULT ne "1"} {return 0} |
| 200 | fossil test-th-eval "setting tcl" |
| 201 | if {$::RESULT eq "1"} {return 1} |
| 202 | return [info exists ::env(TH1_ENABLE_TCL)] |
| 203 | } |
| 204 | |
| 205 | # This procedure only returns non-zero if the TH1 hooks feature was enabled |
| 206 | # at compile-time and is now enabled at runtime. |
| 207 | proc are_th1_hooks_usable_by_fossil {} { |
| 208 | fossil test-th-eval "hasfeature th1Hooks" |
| 209 | if {$::RESULT ne "1"} {return 0} |
| 210 | fossil test-th-eval "setting th1-hooks" |
| 211 | if {$::RESULT eq "1"} {return 1} |
| 212 | return [info exists ::env(TH1_ENABLE_HOOKS)] |
| 213 | } |
| 214 | |
| 215 | # This (rarely used) procedure is designed to run a test within the Fossil |
| 216 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -197,19 +197,23 @@ | |
| 197 | proc is_tcl_usable_by_fossil {} { |
| 198 | fossil test-th-eval "hasfeature tcl" |
| 199 | if {$::RESULT ne "1"} {return 0} |
| 200 | fossil test-th-eval "setting tcl" |
| 201 | if {$::RESULT eq "1"} {return 1} |
| 202 | fossil test-th-eval --open-config "setting tcl" |
| 203 | if {$::RESULT eq "1"} {return 1} |
| 204 | return [info exists ::env(TH1_ENABLE_TCL)] |
| 205 | } |
| 206 | |
| 207 | # This procedure only returns non-zero if the TH1 hooks feature was enabled |
| 208 | # at compile-time and is now enabled at runtime. |
| 209 | proc are_th1_hooks_usable_by_fossil {} { |
| 210 | fossil test-th-eval "hasfeature th1Hooks" |
| 211 | if {$::RESULT ne "1"} {return 0} |
| 212 | fossil test-th-eval "setting th1-hooks" |
| 213 | if {$::RESULT eq "1"} {return 1} |
| 214 | fossil test-th-eval --open-config "setting th1-hooks" |
| 215 | if {$::RESULT eq "1"} {return 1} |
| 216 | return [info exists ::env(TH1_ENABLE_HOOKS)] |
| 217 | } |
| 218 | |
| 219 | # This (rarely used) procedure is designed to run a test within the Fossil |
| 220 |