Fossil SCM
Merge updates from trunk.
Commit
0465fecca355b6647c76bb8303ee59d0562ecd87
Parent
b34dbc78b571a53…
3 files changed
+2
-2
+2
-2
-3
+2
-2
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -96,11 +96,11 @@ | ||
| 96 | 96 | set CODE $rc |
| 97 | 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | 98 | set RESULT $result |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | -# Read a file into memory. | |
| 101 | +# Read a file into memory. | |
| 102 | 102 | # |
| 103 | 103 | proc read_file {filename} { |
| 104 | 104 | set in [open $filename r] |
| 105 | 105 | fconfigure $in -translation binary |
| 106 | 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | ||
| 173 | 173 | test $name 1 |
| 174 | 174 | } else { |
| 175 | 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | 177 | test $name 0 |
| 178 | - } | |
| 178 | + } | |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | # Append all arguments into a single value and then returns it. |
| 182 | 182 | # |
| 183 | 183 | proc appendArgs {args} { |
| 184 | 184 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -96,11 +96,11 @@ | |
| 96 | set CODE $rc |
| 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | set RESULT $result |
| 99 | } |
| 100 | |
| 101 | # Read a file into memory. |
| 102 | # |
| 103 | proc read_file {filename} { |
| 104 | set in [open $filename r] |
| 105 | fconfigure $in -translation binary |
| 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | |
| 173 | test $name 1 |
| 174 | } else { |
| 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | test $name 0 |
| 178 | } |
| 179 | } |
| 180 | |
| 181 | # Append all arguments into a single value and then returns it. |
| 182 | # |
| 183 | proc appendArgs {args} { |
| 184 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -96,11 +96,11 @@ | |
| 96 | set CODE $rc |
| 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | set RESULT $result |
| 99 | } |
| 100 | |
| 101 | # Read a file into memory. |
| 102 | # |
| 103 | proc read_file {filename} { |
| 104 | set in [open $filename r] |
| 105 | fconfigure $in -translation binary |
| 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | |
| 173 | test $name 1 |
| 174 | } else { |
| 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | test $name 0 |
| 178 | } |
| 179 | } |
| 180 | |
| 181 | # Append all arguments into a single value and then returns it. |
| 182 | # |
| 183 | proc appendArgs {args} { |
| 184 |
+2
-2
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -96,11 +96,11 @@ | ||
| 96 | 96 | set CODE $rc |
| 97 | 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | 98 | set RESULT $result |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | -# Read a file into memory. | |
| 101 | +# Read a file into memory. | |
| 102 | 102 | # |
| 103 | 103 | proc read_file {filename} { |
| 104 | 104 | set in [open $filename r] |
| 105 | 105 | fconfigure $in -translation binary |
| 106 | 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | ||
| 173 | 173 | test $name 1 |
| 174 | 174 | } else { |
| 175 | 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | 177 | test $name 0 |
| 178 | - } | |
| 178 | + } | |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | # Append all arguments into a single value and then returns it. |
| 182 | 182 | # |
| 183 | 183 | proc appendArgs {args} { |
| 184 | 184 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -96,11 +96,11 @@ | |
| 96 | set CODE $rc |
| 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | set RESULT $result |
| 99 | } |
| 100 | |
| 101 | # Read a file into memory. |
| 102 | # |
| 103 | proc read_file {filename} { |
| 104 | set in [open $filename r] |
| 105 | fconfigure $in -translation binary |
| 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | |
| 173 | test $name 1 |
| 174 | } else { |
| 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | test $name 0 |
| 178 | } |
| 179 | } |
| 180 | |
| 181 | # Append all arguments into a single value and then returns it. |
| 182 | # |
| 183 | proc appendArgs {args} { |
| 184 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -96,11 +96,11 @@ | |
| 96 | set CODE $rc |
| 97 | if {$rc} {puts "ERROR: $result"} |
| 98 | set RESULT $result |
| 99 | } |
| 100 | |
| 101 | # Read a file into memory. |
| 102 | # |
| 103 | proc read_file {filename} { |
| 104 | set in [open $filename r] |
| 105 | fconfigure $in -translation binary |
| 106 | set txt [read $in [file size $filename]] |
| @@ -173,11 +173,11 @@ | |
| 173 | test $name 1 |
| 174 | } else { |
| 175 | protOut " Expected:\n [join $expected "\n "]" |
| 176 | protOut " Got:\n [join $result "\n "]" |
| 177 | test $name 0 |
| 178 | } |
| 179 | } |
| 180 | |
| 181 | # Append all arguments into a single value and then returns it. |
| 182 | # |
| 183 | proc appendArgs {args} { |
| 184 |
-3
| --- test/th1.test | ||
| +++ test/th1.test | ||
| @@ -468,12 +468,9 @@ | ||
| 468 | 468 | ############################################################################### |
| 469 | 469 | |
| 470 | 470 | fossil test-th-eval "expr 0b1+5" |
| 471 | 471 | test th1-expr-34 {$RESULT eq {6}} |
| 472 | 472 | |
| 473 | - | |
| 474 | 473 | ############################################################################### |
| 475 | 474 | |
| 476 | 475 | fossil test-th-eval "expr 0+0b" |
| 477 | 476 | test th1-expr-35 {$RESULT eq {TH_ERROR: expected number, got: "0b"}} |
| 478 | - | |
| 479 | - | |
| 480 | 477 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -468,12 +468,9 @@ | |
| 468 | ############################################################################### |
| 469 | |
| 470 | fossil test-th-eval "expr 0b1+5" |
| 471 | test th1-expr-34 {$RESULT eq {6}} |
| 472 | |
| 473 | |
| 474 | ############################################################################### |
| 475 | |
| 476 | fossil test-th-eval "expr 0+0b" |
| 477 | test th1-expr-35 {$RESULT eq {TH_ERROR: expected number, got: "0b"}} |
| 478 | |
| 479 | |
| 480 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -468,12 +468,9 @@ | |
| 468 | ############################################################################### |
| 469 | |
| 470 | fossil test-th-eval "expr 0b1+5" |
| 471 | test th1-expr-34 {$RESULT eq {6}} |
| 472 | |
| 473 | ############################################################################### |
| 474 | |
| 475 | fossil test-th-eval "expr 0+0b" |
| 476 | test th1-expr-35 {$RESULT eq {TH_ERROR: expected number, got: "0b"}} |
| 477 |