Fossil SCM

Reduce output when testing in -quiet mode. Output is now limited to test failures (including knownBug) and skipped tests when there are uncommitted changes.

preben 2024-01-10 09:53 testing-improvements
Commit 9c23c50defa0559551d47c69babd0fcdfb6ca42a31ddd6f74aab307f7a02e813
Parent 41c35fb6e2cea4c…
2 files changed +3 -1 +12 -4
~ test/merge5.test ~ test/unversioned.test
M test/merge5.test
+3 -1
--- test/merge5.test
+++ test/merge5.test
@@ -16,11 +16,13 @@
1616
 ############################################################################
1717
 #
1818
 # Tests of the "merge" command
1919
 #
2020
21
-puts "Skipping Merge5 tests"
21
+if {! $::QUIET} {
22
+ puts "Skipping Merge5 tests"
23
+}
2224
 protOut {
2325
 fossil sqlite3 --no-repository reacts badly to SQL dumped from
2426
 repositories created from fossil older than version 2.0.
2527
 }
2628
 test merge5-sqlite3-issue false knownBug
2729
--- test/merge5.test
+++ test/merge5.test
@@ -16,11 +16,13 @@
16 ############################################################################
17 #
18 # Tests of the "merge" command
19 #
20
21 puts "Skipping Merge5 tests"
 
 
22 protOut {
23 fossil sqlite3 --no-repository reacts badly to SQL dumped from
24 repositories created from fossil older than version 2.0.
25 }
26 test merge5-sqlite3-issue false knownBug
27
--- test/merge5.test
+++ test/merge5.test
@@ -16,11 +16,13 @@
16 ############################################################################
17 #
18 # Tests of the "merge" command
19 #
20
21 if {! $::QUIET} {
22 puts "Skipping Merge5 tests"
23 }
24 protOut {
25 fossil sqlite3 --no-repository reacts badly to SQL dumped from
26 repositories created from fossil older than version 2.0.
27 }
28 test merge5-sqlite3-issue false knownBug
29
M test/unversioned.test
+12 -4
--- test/unversioned.test
+++ test/unversioned.test
@@ -322,21 +322,25 @@
322322
 fossil user capabilities uvtester oy
323323
324324
 ###############################################################################
325325
326326
 foreach {pid port outTmpFile} [test_start_server $repository stopArg] {}
327
-puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
327
+if {! $::QUIET} {
328
+ puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
329
+}
328330
 set remote [appendArgs http://uvtester: $password @localhost: $port /]
329331
330332
 ###############################################################################
331333
332334
 set clientDir [file join $tempPath [appendArgs \
333335
 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
334336
335337
 set savedPwd [pwd]
336338
 file mkdir $clientDir; cd $clientDir
337
-puts [appendArgs "Now in client directory \"" [pwd] \".]
339
+if {! $::QUIET} {
340
+ puts [appendArgs "Now in client directory \"" [pwd] \".]
341
+}
338342
 write_file unversioned-client1.txt "This is unversioned client file #1."
339343
340344
 ###############################################################################
341345
342346
 fossil clone --save-http-password $remote uvrepo.fossil
@@ -436,20 +440,24 @@
436440
437441
 ###############################################################################
438442
439443
 cd $savedPwd; unset savedPwd
440444
 file delete -force $clientDir
441
-puts [appendArgs "Now in server directory \"" [pwd] \".]
445
+if {! $::QUIET} {
446
+ puts [appendArgs "Now in server directory \"" [pwd] \".]
447
+}
442448
443449
 ###############################################################################
444450
445451
 set stopped [test_stop_server $stopArg $pid $outTmpFile]
446452
447
-puts [appendArgs \
453
+if {! $::QUIET} {
454
+ puts [appendArgs \
448455
 [expr {$stopped ? "Stopped" : "Could not stop"}] \
449456
 " Fossil server, pid \"" $pid "\", using argument \"" \
450457
 $stopArg \".]
458
+}
451459
452460
 ###############################################################################
453461
454462
 fossil unversioned list
455463
 test unversioned-57 {[regexp \
456464
--- test/unversioned.test
+++ test/unversioned.test
@@ -322,21 +322,25 @@
322 fossil user capabilities uvtester oy
323
324 ###############################################################################
325
326 foreach {pid port outTmpFile} [test_start_server $repository stopArg] {}
327 puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
 
 
328 set remote [appendArgs http://uvtester: $password @localhost: $port /]
329
330 ###############################################################################
331
332 set clientDir [file join $tempPath [appendArgs \
333 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
334
335 set savedPwd [pwd]
336 file mkdir $clientDir; cd $clientDir
337 puts [appendArgs "Now in client directory \"" [pwd] \".]
 
 
338 write_file unversioned-client1.txt "This is unversioned client file #1."
339
340 ###############################################################################
341
342 fossil clone --save-http-password $remote uvrepo.fossil
@@ -436,20 +440,24 @@
436
437 ###############################################################################
438
439 cd $savedPwd; unset savedPwd
440 file delete -force $clientDir
441 puts [appendArgs "Now in server directory \"" [pwd] \".]
 
 
442
443 ###############################################################################
444
445 set stopped [test_stop_server $stopArg $pid $outTmpFile]
446
447 puts [appendArgs \
 
448 [expr {$stopped ? "Stopped" : "Could not stop"}] \
449 " Fossil server, pid \"" $pid "\", using argument \"" \
450 $stopArg \".]
 
451
452 ###############################################################################
453
454 fossil unversioned list
455 test unversioned-57 {[regexp \
456
--- test/unversioned.test
+++ test/unversioned.test
@@ -322,21 +322,25 @@
322 fossil user capabilities uvtester oy
323
324 ###############################################################################
325
326 foreach {pid port outTmpFile} [test_start_server $repository stopArg] {}
327 if {! $::QUIET} {
328 puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
329 }
330 set remote [appendArgs http://uvtester: $password @localhost: $port /]
331
332 ###############################################################################
333
334 set clientDir [file join $tempPath [appendArgs \
335 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
336
337 set savedPwd [pwd]
338 file mkdir $clientDir; cd $clientDir
339 if {! $::QUIET} {
340 puts [appendArgs "Now in client directory \"" [pwd] \".]
341 }
342 write_file unversioned-client1.txt "This is unversioned client file #1."
343
344 ###############################################################################
345
346 fossil clone --save-http-password $remote uvrepo.fossil
@@ -436,20 +440,24 @@
440
441 ###############################################################################
442
443 cd $savedPwd; unset savedPwd
444 file delete -force $clientDir
445 if {! $::QUIET} {
446 puts [appendArgs "Now in server directory \"" [pwd] \".]
447 }
448
449 ###############################################################################
450
451 set stopped [test_stop_server $stopArg $pid $outTmpFile]
452
453 if {! $::QUIET} {
454 puts [appendArgs \
455 [expr {$stopped ? "Stopped" : "Could not stop"}] \
456 " Fossil server, pid \"" $pid "\", using argument \"" \
457 $stopArg \".]
458 }
459
460 ###############################################################################
461
462 fossil unversioned list
463 test unversioned-57 {[regexp \
464

Keyboard Shortcuts

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