From 3253efc138d793cc60a791a21ed44f1fc4e511e0 Mon Sep 17 00:00:00 2001 From: ski Date: Wed, 28 Sep 2016 18:09:28 +0300 Subject: [PATCH] Removed unnecessary slash at the end of path returned by method CurrentDirectory of OSD_Process class --- src/OSD/OSD_Process.cxx | 1 - tests/bugs/fclasses/bug309 | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx index 17ed7074c7..8c76933159 100644 --- a/src/OSD/OSD_Process.cxx +++ b/src/OSD/OSD_Process.cxx @@ -133,7 +133,6 @@ TCollection_AsciiString Name; result.SetValues("","","",Disk,Directory,"",""); } #else - Name += TCollection_AsciiString("/"); result = OSD_Path(Name); // result.SetValues("","","","",Name,"",""); #endif diff --git a/tests/bugs/fclasses/bug309 b/tests/bugs/fclasses/bug309 index 24c7a65ddf..455c620617 100644 --- a/tests/bugs/fclasses/bug309 +++ b/tests/bugs/fclasses/bug309 @@ -23,8 +23,8 @@ if { ${ll} != 2 } { set CurrentDirectory [ string range $CurrentDirectory 2 [expr [string length $CurrentDirectory] -1 ]] set UpTrek [ string range $UpTrek 2 [expr [string length $UpTrek] -1 ]] } else { - set res1 [ string range $result1 1 [expr [string length $result1] -3 ] ] - set res2 [ string range $result2 1 [expr [string length $result2] -3 ] ] + set res1 [ string range $result1 1 [expr [string length $result1] -2 ] ] + set res2 [ string range $result2 1 [expr [string length $result2] -2 ] ] } if {[string compare ${res1} "${CurrentDirectory}"] == 0} { puts "OCC309: OK 1" -- 2.39.5