Fossil SCM

Merge the new knownBug constraint support from trunk.

rberteig 2016-01-27 02:29 rberteig-json-test merge
Commit 2ada5ec76e630c85c85d4e14153aa50f7ec628bc
Parent 62f59956f52bc00…
4 files changed +1 -1 +3 -3 +35 -9 +35 -9
~ test/merge6.test ~ test/merge_renames.test ~ test/tester.tcl ~ test/tester.tcl
M test/merge6.test
+1 -1
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
6262
 fossil ls
6363
6464
 test merge_multi-4 {[normalize_result] eq {f1
6565
 f2
6666
 f3
67
-f4}}
67
+f4}} knownBug
6868
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
62 fossil ls
63
64 test merge_multi-4 {[normalize_result] eq {f1
65 f2
66 f3
67 f4}}
68
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
62 fossil ls
63
64 test merge_multi-4 {[normalize_result] eq {f1
65 f2
66 f3
67 f4}} knownBug
68
M test/merge_renames.test
+3 -3
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156156
 }
157157
158158
 if {$deletes!=0} {
159159
 # failed
160160
 protOut "Error, the merge should not delete any file"
161
- test merge_renames-2 0
161
+ test merge_renames-3 0
162162
 } else {
163
- test merge_renames-2 1
163
+ test merge_renames-3 1
164164
 }
165165
166166
 ######################################
167167
 # Test 4 #
168168
 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198198
199199
 fossil ls
200200
201201
 test merge_renames-5 {[normalize_result] eq {f1
202202
 f2
203
-f3}}
203
+f3}} knownBug
204204
205205
 ######################################
206206
 #
207207
 # Tests for troubles not specifically linked with renames but that I'd like to
208208
 # write:
209209
 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210210
 # [953031915f] - Lack of warning when overwriting extra files
211211
 # [4df5f38f1e] - Troubles merging a file delete with a file change
212212
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156 }
157
158 if {$deletes!=0} {
159 # failed
160 protOut "Error, the merge should not delete any file"
161 test merge_renames-2 0
162 } else {
163 test merge_renames-2 1
164 }
165
166 ######################################
167 # Test 4 #
168 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198
199 fossil ls
200
201 test merge_renames-5 {[normalize_result] eq {f1
202 f2
203 f3}}
204
205 ######################################
206 #
207 # Tests for troubles not specifically linked with renames but that I'd like to
208 # write:
209 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210 # [953031915f] - Lack of warning when overwriting extra files
211 # [4df5f38f1e] - Troubles merging a file delete with a file change
212
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156 }
157
158 if {$deletes!=0} {
159 # failed
160 protOut "Error, the merge should not delete any file"
161 test merge_renames-3 0
162 } else {
163 test merge_renames-3 1
164 }
165
166 ######################################
167 # Test 4 #
168 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198
199 fossil ls
200
201 test merge_renames-5 {[normalize_result] eq {f1
202 f2
203 f3}} knownBug
204
205 ######################################
206 #
207 # Tests for troubles not specifically linked with renames but that I'd like to
208 # write:
209 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210 # [953031915f] - Lack of warning when overwriting extra files
211 # [4df5f38f1e] - Troubles merging a file delete with a file change
212
M test/tester.tcl
+35 -9
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
5858
 set QUIET 1
5959
 set argv [lreplace $argv $i $i]
6060
 } else {
6161
 set QUIET 0
6262
 }
63
+
64
+set i [lsearch $argv -strict]
65
+if {$i>=0} {
66
+ set STRICT 1
67
+ set argv [lreplace $argv $i $i]
68
+} else {
69
+ set STRICT 0
70
+}
6371
6472
 if {[llength $argv]==0} {
6573
 foreach f [lsort [glob $testdir/*.test]] {
6674
 set base [file root [file tail $f]]
6775
 lappend argv $base
@@ -332,24 +340,35 @@
332340
 }
333341
334342
 # Perform a test
335343
 #
336344
 set test_count 0
337
-proc test {name expr} {
338
- global bad_test test_count RESULT
345
+proc test {name expr {constraints ""}} {
346
+ global bad_test ignored_test test_count RESULT
339347
 incr test_count
348
+ set knownBug [expr {"knownBug" in $constraints}]
340349
 set r [uplevel 1 [list expr $expr]]
341350
 if {$r} {
342
- protOut "test $name OK"
351
+ if {$knownBug && !$::STRICT} {
352
+ protOut "test $name OK (knownBug)?"
353
+ } else {
354
+ protOut "test $name OK"
355
+ }
343356
 } else {
344
- protOut "test $name FAILED!" 1
345
- if {$::QUIET} {protOut "RESULT: $RESULT" 1}
346
- lappend bad_test $name
347
- if {$::HALT} exit
357
+ if {$knownBug && !$::STRICT} {
358
+ protOut "test $name FAILED (knownBug)!" 1
359
+ lappend ignored_test $name
360
+ } else {
361
+ protOut "test $name FAILED!" 1
362
+ if {$::QUIET} {protOut "RESULT: $RESULT" 1}
363
+ lappend bad_test $name
364
+ if {$::HALT} exit
365
+ }
348366
 }
349367
 }
350368
 set bad_test {}
369
+set ignored_test {}
351370
352371
 # Return a random string N characters long.
353372
 #
354373
 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
355374
 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
499518
 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
500519
 cd $origwd
501520
 }
502521
 set nErr [llength $bad_test]
503522
 if {$nErr>0 || !$::QUIET} {
504
- protOut "***** Final result: $nErr errors out of $test_count tests" 1
523
+ protOut "***** Final results: $nErr errors out of $test_count tests" 1
524
+}
525
+if {$nErr>0} {
526
+ protOut "***** Considered failures: $bad_test" 1
527
+}
528
+set nErr [llength $ignored_test]
529
+if {$nErr>0 || !$::QUIET} {
530
+ protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1
505531
 }
506532
 if {$nErr>0} {
507
- protOut "***** Failures: $bad_test" 1
533
+ protOut "***** Ignored failures: $ignored_test" 1
508534
 }
509535
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
 
 
 
 
 
 
 
 
63
64 if {[llength $argv]==0} {
65 foreach f [lsort [glob $testdir/*.test]] {
66 set base [file root [file tail $f]]
67 lappend argv $base
@@ -332,24 +340,35 @@
332 }
333
334 # Perform a test
335 #
336 set test_count 0
337 proc test {name expr} {
338 global bad_test test_count RESULT
339 incr test_count
 
340 set r [uplevel 1 [list expr $expr]]
341 if {$r} {
342 protOut "test $name OK"
 
 
 
 
343 } else {
344 protOut "test $name FAILED!" 1
345 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
346 lappend bad_test $name
347 if {$::HALT} exit
 
 
 
 
 
348 }
349 }
350 set bad_test {}
 
351
352 # Return a random string N characters long.
353 #
354 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
355 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
499 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
500 cd $origwd
501 }
502 set nErr [llength $bad_test]
503 if {$nErr>0 || !$::QUIET} {
504 protOut "***** Final result: $nErr errors out of $test_count tests" 1
 
 
 
 
 
 
 
505 }
506 if {$nErr>0} {
507 protOut "***** Failures: $bad_test" 1
508 }
509
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
63
64 set i [lsearch $argv -strict]
65 if {$i>=0} {
66 set STRICT 1
67 set argv [lreplace $argv $i $i]
68 } else {
69 set STRICT 0
70 }
71
72 if {[llength $argv]==0} {
73 foreach f [lsort [glob $testdir/*.test]] {
74 set base [file root [file tail $f]]
75 lappend argv $base
@@ -332,24 +340,35 @@
340 }
341
342 # Perform a test
343 #
344 set test_count 0
345 proc test {name expr {constraints ""}} {
346 global bad_test ignored_test test_count RESULT
347 incr test_count
348 set knownBug [expr {"knownBug" in $constraints}]
349 set r [uplevel 1 [list expr $expr]]
350 if {$r} {
351 if {$knownBug && !$::STRICT} {
352 protOut "test $name OK (knownBug)?"
353 } else {
354 protOut "test $name OK"
355 }
356 } else {
357 if {$knownBug && !$::STRICT} {
358 protOut "test $name FAILED (knownBug)!" 1
359 lappend ignored_test $name
360 } else {
361 protOut "test $name FAILED!" 1
362 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
363 lappend bad_test $name
364 if {$::HALT} exit
365 }
366 }
367 }
368 set bad_test {}
369 set ignored_test {}
370
371 # Return a random string N characters long.
372 #
373 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
374 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
518 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
519 cd $origwd
520 }
521 set nErr [llength $bad_test]
522 if {$nErr>0 || !$::QUIET} {
523 protOut "***** Final results: $nErr errors out of $test_count tests" 1
524 }
525 if {$nErr>0} {
526 protOut "***** Considered failures: $bad_test" 1
527 }
528 set nErr [llength $ignored_test]
529 if {$nErr>0 || !$::QUIET} {
530 protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1
531 }
532 if {$nErr>0} {
533 protOut "***** Ignored failures: $ignored_test" 1
534 }
535
M test/tester.tcl
+35 -9
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
5858
 set QUIET 1
5959
 set argv [lreplace $argv $i $i]
6060
 } else {
6161
 set QUIET 0
6262
 }
63
+
64
+set i [lsearch $argv -strict]
65
+if {$i>=0} {
66
+ set STRICT 1
67
+ set argv [lreplace $argv $i $i]
68
+} else {
69
+ set STRICT 0
70
+}
6371
6472
 if {[llength $argv]==0} {
6573
 foreach f [lsort [glob $testdir/*.test]] {
6674
 set base [file root [file tail $f]]
6775
 lappend argv $base
@@ -332,24 +340,35 @@
332340
 }
333341
334342
 # Perform a test
335343
 #
336344
 set test_count 0
337
-proc test {name expr} {
338
- global bad_test test_count RESULT
345
+proc test {name expr {constraints ""}} {
346
+ global bad_test ignored_test test_count RESULT
339347
 incr test_count
348
+ set knownBug [expr {"knownBug" in $constraints}]
340349
 set r [uplevel 1 [list expr $expr]]
341350
 if {$r} {
342
- protOut "test $name OK"
351
+ if {$knownBug && !$::STRICT} {
352
+ protOut "test $name OK (knownBug)?"
353
+ } else {
354
+ protOut "test $name OK"
355
+ }
343356
 } else {
344
- protOut "test $name FAILED!" 1
345
- if {$::QUIET} {protOut "RESULT: $RESULT" 1}
346
- lappend bad_test $name
347
- if {$::HALT} exit
357
+ if {$knownBug && !$::STRICT} {
358
+ protOut "test $name FAILED (knownBug)!" 1
359
+ lappend ignored_test $name
360
+ } else {
361
+ protOut "test $name FAILED!" 1
362
+ if {$::QUIET} {protOut "RESULT: $RESULT" 1}
363
+ lappend bad_test $name
364
+ if {$::HALT} exit
365
+ }
348366
 }
349367
 }
350368
 set bad_test {}
369
+set ignored_test {}
351370
352371
 # Return a random string N characters long.
353372
 #
354373
 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
355374
 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
499518
 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
500519
 cd $origwd
501520
 }
502521
 set nErr [llength $bad_test]
503522
 if {$nErr>0 || !$::QUIET} {
504
- protOut "***** Final result: $nErr errors out of $test_count tests" 1
523
+ protOut "***** Final results: $nErr errors out of $test_count tests" 1
524
+}
525
+if {$nErr>0} {
526
+ protOut "***** Considered failures: $bad_test" 1
527
+}
528
+set nErr [llength $ignored_test]
529
+if {$nErr>0 || !$::QUIET} {
530
+ protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1
505531
 }
506532
 if {$nErr>0} {
507
- protOut "***** Failures: $bad_test" 1
533
+ protOut "***** Ignored failures: $ignored_test" 1
508534
 }
509535
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
 
 
 
 
 
 
 
 
63
64 if {[llength $argv]==0} {
65 foreach f [lsort [glob $testdir/*.test]] {
66 set base [file root [file tail $f]]
67 lappend argv $base
@@ -332,24 +340,35 @@
332 }
333
334 # Perform a test
335 #
336 set test_count 0
337 proc test {name expr} {
338 global bad_test test_count RESULT
339 incr test_count
 
340 set r [uplevel 1 [list expr $expr]]
341 if {$r} {
342 protOut "test $name OK"
 
 
 
 
343 } else {
344 protOut "test $name FAILED!" 1
345 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
346 lappend bad_test $name
347 if {$::HALT} exit
 
 
 
 
 
348 }
349 }
350 set bad_test {}
 
351
352 # Return a random string N characters long.
353 #
354 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
355 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
499 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
500 cd $origwd
501 }
502 set nErr [llength $bad_test]
503 if {$nErr>0 || !$::QUIET} {
504 protOut "***** Final result: $nErr errors out of $test_count tests" 1
 
 
 
 
 
 
 
505 }
506 if {$nErr>0} {
507 protOut "***** Failures: $bad_test" 1
508 }
509
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
63
64 set i [lsearch $argv -strict]
65 if {$i>=0} {
66 set STRICT 1
67 set argv [lreplace $argv $i $i]
68 } else {
69 set STRICT 0
70 }
71
72 if {[llength $argv]==0} {
73 foreach f [lsort [glob $testdir/*.test]] {
74 set base [file root [file tail $f]]
75 lappend argv $base
@@ -332,24 +340,35 @@
340 }
341
342 # Perform a test
343 #
344 set test_count 0
345 proc test {name expr {constraints ""}} {
346 global bad_test ignored_test test_count RESULT
347 incr test_count
348 set knownBug [expr {"knownBug" in $constraints}]
349 set r [uplevel 1 [list expr $expr]]
350 if {$r} {
351 if {$knownBug && !$::STRICT} {
352 protOut "test $name OK (knownBug)?"
353 } else {
354 protOut "test $name OK"
355 }
356 } else {
357 if {$knownBug && !$::STRICT} {
358 protOut "test $name FAILED (knownBug)!" 1
359 lappend ignored_test $name
360 } else {
361 protOut "test $name FAILED!" 1
362 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
363 lappend bad_test $name
364 if {$::HALT} exit
365 }
366 }
367 }
368 set bad_test {}
369 set ignored_test {}
370
371 # Return a random string N characters long.
372 #
373 set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
374 append vocabulary " ()*^!.eeeeeeeeaaaaattiioo "
@@ -499,10 +518,17 @@
518 protOut "***** End of $testfile: [llength $bad_test] errors so far ******"
519 cd $origwd
520 }
521 set nErr [llength $bad_test]
522 if {$nErr>0 || !$::QUIET} {
523 protOut "***** Final results: $nErr errors out of $test_count tests" 1
524 }
525 if {$nErr>0} {
526 protOut "***** Considered failures: $bad_test" 1
527 }
528 set nErr [llength $ignored_test]
529 if {$nErr>0 || !$::QUIET} {
530 protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1
531 }
532 if {$nErr>0} {
533 protOut "***** Ignored failures: $ignored_test" 1
534 }
535

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button