Fossil SCM

Merge updates from trunk. Add tests.

mistachkin 2014-06-19 21:28 UTC respectformatting merge
Commit 334f518c5f58b0d5d2b9d5374e81c050fef20469
Parent 59d80134ff5d9e0…
4 files changed +25 +25 +13 -1 +2 -3
~ test/comment.test ~ test/comment.test ~ test/tester.tcl ~ www/makefile.wiki
M test/comment.test
+25
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
5454
5555
 ###############################################################################
5656
5757
 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
5858
 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
59
+
60
+###############################################################################
61
+
62
+fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly." 78
63
+test comment-9 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly.\n(2 lines output)"}
64
+
65
+###############################################################################
66
+
67
+fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly. more text here describing the issue.\\nanother line here..................................................................................*" 78
68
+test comment-10 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly. more text here describing the issue.\n another line here....................................................\n ..............................*\n(4 lines output)"}
69
+
70
+###############################################################################
71
+
72
+fossil test-comment-format "HH:MM:SS " "....................................................................................*" 78
73
+test comment-11 {$RESULT eq "HH:MM:SS .....................................................................\n ...............*\n(2 lines output)"}
74
+
75
+###############################################################################
76
+
77
+fossil test-comment-format "HH:MM:SS " ".....................................................................*" 78
78
+test comment-12 {$RESULT eq "HH:MM:SS .....................................................................\n *\n(2 lines output)"}
79
+
80
+###############################################################################
81
+
82
+fossil test-comment-format "*TEST* " "this\tis a test." 26
83
+test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
5984
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
54
55 ###############################################################################
56
57 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
58 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
54
55 ###############################################################################
56
57 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
58 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
59
60 ###############################################################################
61
62 fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly." 78
63 test comment-9 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly.\n(2 lines output)"}
64
65 ###############################################################################
66
67 fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly. more text here describing the issue.\\nanother line here..................................................................................*" 78
68 test comment-10 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly. more text here describing the issue.\n another line here....................................................\n ..............................*\n(4 lines output)"}
69
70 ###############################################################################
71
72 fossil test-comment-format "HH:MM:SS " "....................................................................................*" 78
73 test comment-11 {$RESULT eq "HH:MM:SS .....................................................................\n ...............*\n(2 lines output)"}
74
75 ###############################################################################
76
77 fossil test-comment-format "HH:MM:SS " ".....................................................................*" 78
78 test comment-12 {$RESULT eq "HH:MM:SS .....................................................................\n *\n(2 lines output)"}
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
M test/comment.test
+25
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
5454
5555
 ###############################################################################
5656
5757
 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
5858
 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
59
+
60
+###############################################################################
61
+
62
+fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly." 78
63
+test comment-9 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly.\n(2 lines output)"}
64
+
65
+###############################################################################
66
+
67
+fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly. more text here describing the issue.\\nanother line here..................................................................................*" 78
68
+test comment-10 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly. more text here describing the issue.\n another line here....................................................\n ..............................*\n(4 lines output)"}
69
+
70
+###############################################################################
71
+
72
+fossil test-comment-format "HH:MM:SS " "....................................................................................*" 78
73
+test comment-11 {$RESULT eq "HH:MM:SS .....................................................................\n ...............*\n(2 lines output)"}
74
+
75
+###############################################################################
76
+
77
+fossil test-comment-format "HH:MM:SS " ".....................................................................*" 78
78
+test comment-12 {$RESULT eq "HH:MM:SS .....................................................................\n *\n(2 lines output)"}
79
+
80
+###############################################################################
81
+
82
+fossil test-comment-format "*TEST* " "this\tis a test." 26
83
+test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
5984
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
54
55 ###############################################################################
56
57 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
58 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
--- test/comment.test
+++ test/comment.test
@@ -54,5 +54,30 @@
54
55 ###############################################################################
56
57 fossil test-comment-format --decode "" "this\\sis\\sa\\sshort\\scomment." 26
58 test comment-8 {$RESULT eq "this is a short comment.\n(1 lines output)"}
59
60 ###############################################################################
61
62 fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly." 78
63 test comment-9 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly.\n(2 lines output)"}
64
65 ###############################################################################
66
67 fossil test-comment-format --decode "HH:MM:SS " "this is a long comment that should span multiple lines if the test is working correctly. more text here describing the issue.\\nanother line here..................................................................................*" 78
68 test comment-10 {$RESULT eq "HH:MM:SS this is a long comment that should span multiple lines if the test is\n working correctly. more text here describing the issue.\n another line here....................................................\n ..............................*\n(4 lines output)"}
69
70 ###############################################################################
71
72 fossil test-comment-format "HH:MM:SS " "....................................................................................*" 78
73 test comment-11 {$RESULT eq "HH:MM:SS .....................................................................\n ...............*\n(2 lines output)"}
74
75 ###############################################################################
76
77 fossil test-comment-format "HH:MM:SS " ".....................................................................*" 78
78 test comment-12 {$RESULT eq "HH:MM:SS .....................................................................\n *\n(2 lines output)"}
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
M test/tester.tcl
+13 -1
--- test/tester.tcl
+++ test/tester.tcl
@@ -41,10 +41,18 @@
4141
 set PROT 1
4242
 set argv [lreplace $argv $i $i]
4343
 } else {
4444
 set PROT 0
4545
 }
46
+
47
+set i [lsearch $argv -verbose]
48
+if {$i>=0} {
49
+ set VERBOSE 1
50
+ set argv [lreplace $argv $i $i]
51
+} else {
52
+ set VERBOSE 0
53
+}
4654
4755
 if {[llength $argv]==0} {
4856
 foreach f [lsort [glob $testdir/*.test]] {
4957
 set base [file root [file tail $f]]
5058
 lappend argv $base
@@ -93,11 +101,15 @@
93101
94102
 flush stdout
95103
 set rc [catch {eval exec $cmd} result]
96104
 global RESULT CODE
97105
 set CODE $rc
98
- if {$rc} {protOut "ERROR: $result"}
106
+ if {$rc} {
107
+ protOut "ERROR: $result"
108
+ } elseif {$::VERBOSE} {
109
+ protOut "RESULT: $result"
110
+ }
99111
 set RESULT $result
100112
 }
101113
102114
 # Read a file into memory.
103115
 #
104116
--- test/tester.tcl
+++ test/tester.tcl
@@ -41,10 +41,18 @@
41 set PROT 1
42 set argv [lreplace $argv $i $i]
43 } else {
44 set PROT 0
45 }
 
 
 
 
 
 
 
 
46
47 if {[llength $argv]==0} {
48 foreach f [lsort [glob $testdir/*.test]] {
49 set base [file root [file tail $f]]
50 lappend argv $base
@@ -93,11 +101,15 @@
93
94 flush stdout
95 set rc [catch {eval exec $cmd} result]
96 global RESULT CODE
97 set CODE $rc
98 if {$rc} {protOut "ERROR: $result"}
 
 
 
 
99 set RESULT $result
100 }
101
102 # Read a file into memory.
103 #
104
--- test/tester.tcl
+++ test/tester.tcl
@@ -41,10 +41,18 @@
41 set PROT 1
42 set argv [lreplace $argv $i $i]
43 } else {
44 set PROT 0
45 }
46
47 set i [lsearch $argv -verbose]
48 if {$i>=0} {
49 set VERBOSE 1
50 set argv [lreplace $argv $i $i]
51 } else {
52 set VERBOSE 0
53 }
54
55 if {[llength $argv]==0} {
56 foreach f [lsort [glob $testdir/*.test]] {
57 set base [file root [file tail $f]]
58 lappend argv $base
@@ -93,11 +101,15 @@
101
102 flush stdout
103 set rc [catch {eval exec $cmd} result]
104 global RESULT CODE
105 set CODE $rc
106 if {$rc} {
107 protOut "ERROR: $result"
108 } elseif {$::VERBOSE} {
109 protOut "RESULT: $result"
110 }
111 set RESULT $result
112 }
113
114 # Read a file into memory.
115 #
116
M www/makefile.wiki
+2 -3
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -42,13 +42,12 @@
4242
 The sqlite3.c and sqlite3.h source files are byte-for-byte copies of a
4343
 standard [http://www.sqlite.org/amalgamation.html | amalgamation].
4444
 The shell.c source file is code for the SQLite
4545
 [http://www.sqlite.org/sqlite.html | command-line shell] that is used
4646
 to help implement the [/help/sqlite3 | fossil sql] command. The
47
-shell.c source file has been modified slightly from the standard
48
-shell.c file in the SQLite release. Search for "Fossil Patch" in
49
-the shell.c source file of Fossil to see the changes.
47
+shell.c source file is also a byte-for-byte copy of the
48
+shell.c file from the SQLite release.
5049
5150
 The TH1 script engine is implemented using files:
5251
5352
 7. th.c
5453
 8. th.h
5554
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -42,13 +42,12 @@
42 The sqlite3.c and sqlite3.h source files are byte-for-byte copies of a
43 standard [http://www.sqlite.org/amalgamation.html | amalgamation].
44 The shell.c source file is code for the SQLite
45 [http://www.sqlite.org/sqlite.html | command-line shell] that is used
46 to help implement the [/help/sqlite3 | fossil sql] command. The
47 shell.c source file has been modified slightly from the standard
48 shell.c file in the SQLite release. Search for "Fossil Patch" in
49 the shell.c source file of Fossil to see the changes.
50
51 The TH1 script engine is implemented using files:
52
53 7. th.c
54 8. th.h
55
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -42,13 +42,12 @@
42 The sqlite3.c and sqlite3.h source files are byte-for-byte copies of a
43 standard [http://www.sqlite.org/amalgamation.html | amalgamation].
44 The shell.c source file is code for the SQLite
45 [http://www.sqlite.org/sqlite.html | command-line shell] that is used
46 to help implement the [/help/sqlite3 | fossil sql] command. The
47 shell.c source file is also a byte-for-byte copy of the
48 shell.c file from the SQLite release.
 
49
50 The TH1 script engine is implemented using files:
51
52 7. th.c
53 8. th.h
54

Keyboard Shortcuts

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