Eskil

Check-in [358ad77351]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Adapt to new dirdiff internals.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 358ad7735123f535e9199dba913c3a0cfb8aa4d0
User & Date: peter 2008-02-21 06:31:35.000
Context
2008-02-21
06:35
Adapted to newer detecting, including HG and SVN check-in: f8fccdbf52 user: peter tags: trunk
06:31
Adapt to new dirdiff internals. check-in: 358ad77351 user: peter tags: trunk
06:31
Moved ttk adaptions to last in Init, to accomodate test suite. check-in: cbfbef9a6f user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to tests/dir.test. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14

# Tests for comparing directories.                          -*- tcl -*-
#----------------------------------------------------------------------
# $Revision$
#----------------------------------------------------------------------

set ::Pref(dir,ignorekey) 0
set ::Pref(comparelevel) 1

proc testCompareFiles {text1 text2 {sametime 0}} {
    set ch [open _f1_ w]
    puts -nonewline $ch $text1
    close $ch

    set ch [open _f2_ w]







|








1
2
3
4
5
6
7
8
9
10
11
12
13
14

# Tests for comparing directories.                          -*- tcl -*-
#----------------------------------------------------------------------
# $Revision$
#----------------------------------------------------------------------

set ::Pref(dir,ignorekey) 0
set ::Pref(dir,comparelevel) 1

proc testCompareFiles {text1 text2 {sametime 0}} {
    set ch [open _f1_ w]
    puts -nonewline $ch $text1
    close $ch

    set ch [open _f2_ w]
︙︙
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125

} -cleanup {
    file delete -force _f1_
} -result {000}

test dir-4.1 {
    CompareFiles, no contents
} -body {
    set ::Pref(comparelevel) 0
    set res [testCompareFiles "abab" "baba"]
    # Different size
    append res [testCompareFiles "abab" "babax"]
    set ::Pref(comparelevel) 1
    append res [testCompareFiles "abab" "baba"]
    # Same time
    append res [testCompareFiles "abab" "baba" 1]
} -result {11000011}

test dir-5.1 {
    CompareFiles, directories








|



|








107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125

} -cleanup {
    file delete -force _f1_
} -result {000}

test dir-4.1 {
    CompareFiles, no contents
} -body {
    set ::Pref(dir,comparelevel) 0
    set res [testCompareFiles "abab" "baba"]
    # Different size
    append res [testCompareFiles "abab" "babax"]
    set ::Pref(dir,comparelevel) 1
    append res [testCompareFiles "abab" "baba"]
    # Same time
    append res [testCompareFiles "abab" "baba" 1]
} -result {11000011}

test dir-5.1 {
    CompareFiles, directories
︙︙
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157

} -cleanup {
    file delete -force _f1_ _d1_ _d2_
} -result {01}

test dir-6.1 {
    CompareFiles, binary
} -body {
    set ::Pref(comparelevel) 1b
    set res [testCompareFiles "short" "longer"]
} -cleanup {
    set ::Pref(comparelevel) 1
} -result {00}

test dir-6.2 {
    CompareFiles, binary
} -body {
    set ::Pref(comparelevel) 1b
    set text1 [string repeat hugg 1534]\rhejsan
    set text2 [string repeat hugg 1534]\nhejsan

    set res [testCompareFiles $text1 $text2]
    set ::Pref(comparelevel) 1
    append res [testCompareFiles $text1 $text2]
} -result {0011}








|


|





|




|



134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157

} -cleanup {
    file delete -force _f1_ _d1_ _d2_
} -result {01}

test dir-6.1 {
    CompareFiles, binary
} -body {
    set ::Pref(dir,comparelevel) 2
    set res [testCompareFiles "short" "longer"]
} -cleanup {
    set ::Pref(dir,comparelevel) 1
} -result {00}

test dir-6.2 {
    CompareFiles, binary
} -body {
    set ::Pref(dir,comparelevel) 2
    set text1 [string repeat hugg 1534]\rhejsan
    set text2 [string repeat hugg 1534]\nhejsan

    set res [testCompareFiles $text1 $text2]
    set ::Pref(dir,comparelevel) 1
    append res [testCompareFiles $text1 $text2]
} -result {0011}