Fix problem with make test when environment is not set

[modules/shaper.git] / env_standalone.sh

diff --git a/env_standalone.sh b/env_standalone.sh
index 02f9932ed2dc5f8dcf98bcf82103ba4f1317e298..7e55f36cc4a5a721e0d8cfbee1421d6147daea92 100644 (file)
--- a/env_standalone.sh
+++ b/env_standalone.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 
-pushd ${SOURCES_DIR}
-  source salome_env.sh
-  source env_linux.sh
-popd
+for path in TOOLS_DIR; do
+  if [[ -z "${!path}" ]]; then 
+    echo "${path} not found."; exit 1
+  else
+    echo "Found ${path}: ${!path}"
+  fi
+done
+
+source ${TOOLS_DIR}/env_linux.sh
 
 export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export LightAppConfig=${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
+export LightAppConfig=${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui