Fossil SCM
Handling missing th1-setup file in the test suite helpers saveTh1SetupFile and restoreTh1SetupFile.
Commit
5f701f195d856f2d77400ec159ce9790a42c6d1d
Parent
589b902edb5565f…
1 file changed
+6
-3
+6
-3
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -221,24 +221,27 @@ | ||
| 221 | 221 | set oldFileName [getTh1SetupFileName] |
| 222 | 222 | if {[file exists $oldFileName]} then { |
| 223 | 223 | set newFileName [getSavedTh1SetupFileName] |
| 224 | 224 | catch {file delete $newFileName} |
| 225 | 225 | file rename $oldFileName $newFileName |
| 226 | - file delete $oldFileName | |
| 227 | 226 | } |
| 228 | 227 | } |
| 229 | 228 | |
| 230 | 229 | # Restores the original TH1 setup script file by renaming it back, based |
| 231 | 230 | # on the current process ID. |
| 232 | 231 | # |
| 233 | 232 | proc restoreTh1SetupFile {} { |
| 234 | 233 | set oldFileName [getSavedTh1SetupFileName] |
| 234 | + set newFileName [getTh1SetupFileName] | |
| 235 | 235 | if {[file exists $oldFileName]} then { |
| 236 | - set newFileName [getTh1SetupFileName] | |
| 237 | 236 | catch {file delete $newFileName} |
| 238 | 237 | file rename $oldFileName $newFileName |
| 239 | - file delete $oldFileName | |
| 238 | + } else { | |
| 239 | + # | |
| 240 | + # NOTE: There was no TH1 setup script file, delete the test one. | |
| 241 | + # | |
| 242 | + file delete $newFileName | |
| 240 | 243 | } |
| 241 | 244 | } |
| 242 | 245 | |
| 243 | 246 | # Perform a test |
| 244 | 247 | # |
| 245 | 248 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -221,24 +221,27 @@ | |
| 221 | set oldFileName [getTh1SetupFileName] |
| 222 | if {[file exists $oldFileName]} then { |
| 223 | set newFileName [getSavedTh1SetupFileName] |
| 224 | catch {file delete $newFileName} |
| 225 | file rename $oldFileName $newFileName |
| 226 | file delete $oldFileName |
| 227 | } |
| 228 | } |
| 229 | |
| 230 | # Restores the original TH1 setup script file by renaming it back, based |
| 231 | # on the current process ID. |
| 232 | # |
| 233 | proc restoreTh1SetupFile {} { |
| 234 | set oldFileName [getSavedTh1SetupFileName] |
| 235 | if {[file exists $oldFileName]} then { |
| 236 | set newFileName [getTh1SetupFileName] |
| 237 | catch {file delete $newFileName} |
| 238 | file rename $oldFileName $newFileName |
| 239 | file delete $oldFileName |
| 240 | } |
| 241 | } |
| 242 | |
| 243 | # Perform a test |
| 244 | # |
| 245 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -221,24 +221,27 @@ | |
| 221 | set oldFileName [getTh1SetupFileName] |
| 222 | if {[file exists $oldFileName]} then { |
| 223 | set newFileName [getSavedTh1SetupFileName] |
| 224 | catch {file delete $newFileName} |
| 225 | file rename $oldFileName $newFileName |
| 226 | } |
| 227 | } |
| 228 | |
| 229 | # Restores the original TH1 setup script file by renaming it back, based |
| 230 | # on the current process ID. |
| 231 | # |
| 232 | proc restoreTh1SetupFile {} { |
| 233 | set oldFileName [getSavedTh1SetupFileName] |
| 234 | set newFileName [getTh1SetupFileName] |
| 235 | if {[file exists $oldFileName]} then { |
| 236 | catch {file delete $newFileName} |
| 237 | file rename $oldFileName $newFileName |
| 238 | } else { |
| 239 | # |
| 240 | # NOTE: There was no TH1 setup script file, delete the test one. |
| 241 | # |
| 242 | file delete $newFileName |
| 243 | } |
| 244 | } |
| 245 | |
| 246 | # Perform a test |
| 247 | # |
| 248 |