0028673: getsourcefile Draw command return different output on Linux and Windows...

The method Draw_Interpretor::add() has been corrected so that the command getsourcefile returned the relative path starting with "src" without leading "/" on all platforms.

diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx
index d84973ea259d424ebe9515ea21450812a8b07cf4..025df3183f5579b5856fa59da8ea12814d630d1f 100644 (file)
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -311,6 +311,8 @@ void Draw_Interpretor::add (const Standard_CString          theCommandName,
   aPath.SetNode ("");
   TCollection_AsciiString aSrcPath;
   aPath.SystemName (aSrcPath);
+  if (aSrcPath.Value(1) == '/')
+    aSrcPath.Remove(1);
   Tcl_SetVar2 (myInterp, "Draw_Files", aName, aSrcPath.ToCString(), TCL_GLOBAL_ONLY);
 }
 

diff --git a/tests/demo/draw/getsource b/tests/demo/draw/getsource
index 42222546472475a5b0b1d5ef6d8fb1415ac8fc58..acfe3bbac100e5bacac3e86a0bfe4553e7f79276 100755 (executable)
--- a/tests/demo/draw/getsource
+++ b/tests/demo/draw/getsource
@@ -1,13 +1,7 @@
-puts "TODO OCC28773 Windows: Error: command 'getsourcefile pload' returned"
-
 # test for command getsource
 
 # check that path returned for command pload is as expected
-if { [checkplatform -windows] } {
-    set expected src/Draw/Draw_PloadCommands.cxx
-} else {
-    set expected /src/Draw/Draw_PloadCommands.cxx
-}
+set expected src/Draw/Draw_PloadCommands.cxx
 set path [lindex [getsourcefile pload] 1]
 if { [string compare $path $expected] } {
     puts "Error: command 'getsourcefile pload' returned '$path' while expected '$expected'"