0029048: Draw - avoid setting default paths to scripts and test data folders if set...

Avoid adding default paths to test scripts when DRAW is started if relevant variables (CSF_TestStriptsPath) are already defined in the environment.

diff --git a/src/DrawResources/DrawDefault b/src/DrawResources/DrawDefault
index b0c117cc9447c20e434a978c07067e7457ef274a..71b121a5476e9d4fd994f34aec1cc8a402f4bff7 100755 (executable)
--- a/src/DrawResources/DrawDefault
+++ b/src/DrawResources/DrawDefault
@@ -59,18 +59,12 @@ if { [file isdirectory $dir] } {
   puts "Warning: could not find DRAW directory"
 }
 
-# set default testing environment
-if {[info exists ::env(CSF_OCCTTestsPath)] && [file isdirectory $env(CSF_OCCTTestsPath)]} {
-  if { ! [info exists env(CSF_TestScriptsPath)] } {
+# set default testing environment (unless already defined before)
+if { ! [info exists env(CSF_TestScriptsPath)] } {
+  if {[info exists ::env(CSF_OCCTTestsPath)] && [file isdirectory $env(CSF_OCCTTestsPath)]} {
     set env(CSF_TestScriptsPath) $env(CSF_OCCTTestsPath)
-  } else {
-    set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CSF_OCCTTestsPath)
-  }  
-} elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } {
-  if { ! [info exists env(CSF_TestScriptsPath)] } {
+  } elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } {
     set env(CSF_TestScriptsPath) $env(CASROOT)/tests
-  } else {
-    set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CASROOT)/tests
   }
 }
 if {[info exists ::env(CSF_OCCTDataPath)] && [file isdirectory $env(CSF_OCCTDataPath)]} {