diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2004-05-25 19:02:23 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2004-05-25 19:02:23 (GMT) |
| commit | dc197307b4c10ab12c36e6cab81c20b080c6dc30 (patch) | |
| tree | 7a317582b8d3131d866c9bf1adfac0cb22be5d54 /tests/winFCmd.test | |
| parent | b0ba32e241f79666fbb804584f67148c88e93319 (diff) | |
| download | tcl-dc197307b4c10ab12c36e6cab81c20b080c6dc30.zip tcl-dc197307b4c10ab12c36e6cab81c20b080c6dc30.tar.gz tcl-dc197307b4c10ab12c36e6cab81c20b080c6dc30.tar.bz2 | |
* tests/winFCmd.test: Correct test for the presence of a CD-ROM so
that it doesn't misdetect some other sort
of filesystem with a write-protected root as
being a CD-ROM drive. [Bug 918267]
Diffstat (limited to 'tests/winFCmd.test')
| -rw-r--r-- | tests/winFCmd.test | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tests/winFCmd.test b/tests/winFCmd.test index 0b1fdf0..a8a05c4 100644 --- a/tests/winFCmd.test +++ b/tests/winFCmd.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winFCmd.test,v 1.20.2.4 2004/05/04 22:26:00 hobbs Exp $ +# RCS: @(#) $Id: winFCmd.test,v 1.20.2.5 2004/05/25 19:02:28 kennykb Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -64,20 +64,11 @@ set ::tcltest::testConstraints(exdev) 0 # find a CD-ROM so we can test read-only filesystems. set cdrom {} -set nodrive x: -foreach p {d e f g h i j k l m n o p q r s t u v w x y z} { - set name ${p}:/dummy~~.fil - if [catch {set fd [open $name w]}] { - set err [lindex $errorCode 1] - if {$cdrom == "" && $err == "EACCES"} { +if { [info commands ::testvolumetype] ne {} } { + foreach p {d e f g h i j k l m n o p q r s t u v w x y z} { + if { ! [catch { testvolumetype ${p}: } result] && $result eq {CDFS} } { set cdrom ${p}: } - if {$err == "ENOENT"} { - set nodrive ${p}: - } - } else { - close $fd - file delete $name } } |