diff options
| author | dgp@users.sourceforge.net <dgp> | 2002-06-13 15:31:38 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2002-06-13 15:31:38 (GMT) |
| commit | f2dcc1b2ec530a1c7946ced2631319910626d11f (patch) | |
| tree | 684f81d68c518ddcb7051828b05c86b22f8591ea /tests | |
| parent | 7303c3d7a00b5a89a5a8f3bf5553e9943ba54557 (diff) | |
| download | tk-f2dcc1b2ec530a1c7946ced2631319910626d11f.zip tk-f2dcc1b2ec530a1c7946ced2631319910626d11f.tar.gz tk-f2dcc1b2ec530a1c7946ced2631319910626d11f.tar.bz2 | |
* tests/cursor.test: corrected error after cursor-2.2.
* tests/defs.tcl: Added enhancements to Tk's fake version of
tcltest required by recent cursor.test changes.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cursor.test | 4 | ||||
| -rw-r--r-- | tests/defs.tcl | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/cursor.test b/tests/cursor.test index 35a1d84..11e23aa 100644 --- a/tests/cursor.test +++ b/tests/cursor.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: cursor.test,v 1.4 2002/06/13 09:46:39 dkf Exp $ +# RCS: @(#) $Id: cursor.test,v 1.5 2002/06/13 15:31:39 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { source [file join [pwd] [file dirname [info script]] defs.tcl] @@ -85,7 +85,7 @@ foreach wincur(num) $wincur(data_octal) { append wincur(data_binary) [binary format c 0$wincur(num)] } set wincur(dir) [::tcltest::makeDirectory {dir with spaces}] -set wincur(file) [::tcltest::makeFile $curdata "test file.cur" $wincur(dir)] +set wincur(file) [::tcltest::makeFile $wincur(data_binary) "test file.cur" $wincur(dir)] test cursor-2.3 {Tk_GetCursor procedure: cursor specs are lists} {pcOnly} { destroy .b1 button .b1 -cursor [list @$wincur(file)] diff --git a/tests/defs.tcl b/tests/defs.tcl index 3c79557..e16a136 100644 --- a/tests/defs.tcl +++ b/tests/defs.tcl @@ -11,7 +11,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: defs.tcl,v 1.8 2001/10/19 17:43:35 hobbs Exp $ +# RCS: @(#) $Id: defs.tcl,v 1.9 2002/06/13 15:31:39 dgp Exp $ # Initialize wish shell @@ -784,7 +784,10 @@ proc ::tcltest::normalizeMsg {msg} { # cleanupTests was called, add it to the $filesMade list, so it will # be removed by the next call to cleanupTests. # -proc ::tcltest::makeFile {contents name} { +proc ::tcltest::makeFile {contents name {directory {}}} { + if {[string length $directory]} { + set name [file join $directory $name] + } set fd [open $name w] fconfigure $fd -translation lf if {[string index $contents [expr {[string length $contents] - 1}]] == "\n"} { @@ -819,6 +822,7 @@ proc ::tcltest::makeDirectory {name} { if {[lsearch -exact $::tcltest::filesMade $fullName] == -1} { lappend ::tcltest::filesMade $fullName } + return $fullName } proc ::tcltest::removeDirectory {name} { |