1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00

0023430: Tests in xcaf group fail in parallel mode

This commit is contained in:
ski 2012-09-12 18:24:01 +04:00 committed by bugmaster
parent b10d190ca0
commit dd2c7137e0
2 changed files with 16 additions and 14 deletions

View File

@ -24,11 +24,13 @@ set ErrorCode 0
if { [info exists imagedir] == 0 } { if { [info exists imagedir] == 0 } {
set imagedir . set imagedir .
} }
if { [info exists test_image ] == 0 } {
set test_image photo
}
#set WorkDirectory "$env(TmpDir)" #set WorkDirectory "$env(TmpDir)"
set WorkDirectory $imagedir set WorkDirectory $imagedir
if {![file exists $WorkDirectory]} { if {![file exists $WorkDirectory]} {
catch {[file mkdir $WorkDirectory]} catch {[file mkdir $WorkDirectory]}
} else { } else {

View File

@ -527,19 +527,19 @@ if { [regexp "LAYERS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsM
################## WRITING FILE ##################" ################## WRITING FILE ##################"
###Open temporary file ###Open temporary file
if { [string compare ${TypeOfFile} ""] == 0 } { if { [string compare ${TypeOfFile} ""] == 0 } {
set saving [SaveAs D_First $WorkDirectory/D_First.dxc] set saving [SaveAs D_First $WorkDirectory/${casename}_D_First.dxc]
set closing [Close D_First] set closing [Close D_First]
set opening [Open $WorkDirectory/D_First.dxc D_Second] set opening [Open $WorkDirectory/${casename}_D_First.dxc D_Second]
} elseif {[string compare ${TypeOfFile} "igs"] == 0 } { } elseif {[string compare ${TypeOfFile} "igs"] == 0 } {
set writing [WriteIges D_First $WorkDirectory/D_First.igs] set writing [WriteIges D_First $WorkDirectory/${casename}_D_First.igs]
set reading [ReadIges D_Second $WorkDirectory/D_First.igs] set reading [ReadIges D_Second $WorkDirectory/${casename}_D_First.igs]
} elseif {[string compare ${TypeOfFile} "stp"] == 0 } { } elseif {[string compare ${TypeOfFile} "stp"] == 0 } {
set writing [WriteStep D_First $WorkDirectory/D_First.stp] set writing [WriteStep D_First $WorkDirectory/${casename}_D_First.stp]
set reading [ReadStep D_Second $WorkDirectory/D_First.stp] set reading [ReadStep D_Second $WorkDirectory/${casename}_D_First.stp]
} elseif {[string compare ${TypeOfFile} "brep"] == 0 } { } elseif {[string compare ${TypeOfFile} "brep"] == 0 } {
XGetOneShape Shape1 D_First XGetOneShape Shape1 D_First
set saving [save Shape1 $WorkDirectory/D_First.brep] set saving [save Shape1 $WorkDirectory/${casename}_D_First.brep]
restore $WorkDirectory/D_First.brep NewShape1 restore $WorkDirectory/${casename}_D_First.brep NewShape1
XNewDoc D_Second XNewDoc D_Second
XAddShape D_Second NewShape1 XAddShape D_Second NewShape1
} else { } else {
@ -548,13 +548,13 @@ if { [string compare ${TypeOfFile} ""] == 0 } {
} }
if { [string compare ${TypeOfFile} ""] == 0 } { if { [string compare ${TypeOfFile} ""] == 0 } {
catch {[file delete $WorkDirectory/D_First.dxc]} catch {[file delete $WorkDirectory/${casename}_D_First.dxc]}
} elseif {[string compare ${TypeOfFile} "igs"] == 0 } { } elseif {[string compare ${TypeOfFile} "igs"] == 0 } {
catch {[file delete $WorkDirectory/D_First.igs]} catch {[file delete $WorkDirectory/${casename}_D_First.igs]}
} elseif {[string compare ${TypeOfFile} "stp"] == 0} { } elseif {[string compare ${TypeOfFile} "stp"] == 0} {
catch {[file delete $WorkDirectory/D_First.stp]} catch {[file delete $WorkDirectory/${casename}_D_First.stp]}
} elseif {[string compare ${TypeOfFile} "brep"] == 0} { } elseif {[string compare ${TypeOfFile} "brep"] == 0} {
catch {[file delete $WorkDirectory/D_First.brep]} catch {[file delete $WorkDirectory/${casename}_D_First.brep]}
} }
# Get information # Get information
# Get shape for standard analysis # Get shape for standard analysis
@ -923,7 +923,7 @@ if {[isdraw result]} {
smallview smallview
donly result donly result
fit fit
xwd $imagedir/photo.gif xwd $imagedir/${test_image}.gif
} }
if {[expr $ErrorCode == 2]} { if {[expr $ErrorCode == 2]} {