OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031006: Draw Harness - locate_data_file fails on path containing spaces

Browse Source
This commit is contained in:
kgv 2019-09-26 22:53:46 +03:00 committed by bugmaster
parent d9619512e1
commit c61c864f73
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/DrawResources/TestCommands.tcl
View File

@ -1117,34 +1117,35 @@ proc locate_data_file {filename} {
# check if the file is located in the subdirectory data of the script dir
set scriptfile [info script]
if { $scriptfile != "" } {
set path [file join [file dirname $scriptfile] data $filename]
if { [file exists $path] } {
return [file normalize $path]
if { "$scriptfile" != "" } {
set path [file join [file dirname "$scriptfile"] data "$filename"]
if { [file exists "$path"] } {
return [file normalize "$path"]
}
}
# check sub-directories in paths indicated by CSF_TestDataPath
if { [info exists env(CSF_TestDataPath)] } {
foreach dir [_split_path $env(CSF_TestDataPath)] {
while {[llength $dir] != 0} {
set name [lindex $dir 0]
set dir [lrange $dir 1 end]
set dir [list "$dir"]
while {[llength "$dir"] != 0} {
set name [lindex "$dir" 0]
set dir [lrange "$dir" 1 end]
# skip directories starting with dot
set aTail [file tail $name]
if { [regexp {^[.]} $aTail] } { continue }
if { [file exists $name/$filename] } {
return [file normalize $name/$filename]
set aTail [file tail "$name"]
if { [regexp {^[.]} "$aTail"] } { continue }
if { [file exists "$name/$filename"] } {
return [file normalize "$name/$filename"]
}
eval lappend dir [glob -nocomplain -directory $name -type d *]
eval lappend dir [glob -nocomplain -directory "$name" -type d *]
}
}
}
# check current datadir
if { [file exists [uplevel datadir]/$filename] } {
return [file normalize [uplevel datadir]/$filename]
if { [file exists "[uplevel datadir]/$filename"] } {
return [file normalize "[uplevel datadir]/$filename"]
}
# raise error