Commit 6d130a51 authored by Charles Delort's avatar Charles Delort
Browse files

SPI-1724: write temp files in correct directory

parent 460017bd
......@@ -185,7 +185,11 @@ if [ "$sys" == "Darwin" ]; then
PATH=$PATH:/usr/local/bin:/bin:/usr/bin DYLD_LIBRARY_PATH=`dirname ${pythonExecutable}`/../lib ${pythonExecutable} $topdirl/env/xenv --xml=$envxml "$@"
else
# prepend cool and coral paths to LD_LIBRARY_PATH
newxml=$(mktemp --tmpdir=.)
if [ -z ${WORKSPACE_TMP+x} ]; then #SPI-1724
newxml=$(mktemp --tmpdir=.)
else
newxml=$(mktemp --tmpdir=${WORKSPACE_TMP})
fi
trap "{ rm -f $newxml; }" EXIT
echo `sed '$d' $envxml`> $newxml
echo `grep -i -e "ld_lib.*coral" $envxml | head -1` >> $newxml
......
......@@ -60,7 +60,11 @@ else
exit 1
fi
tmpdir=`mktemp -d --tmpdir=. $USER.XXXXXXXXXXXX`
if [ -z ${WORKSPACE_TMP+x} ]; then #SPI-1724
tmpdir=$(mktemp -d --tmpdir=. $USER.XXXXXXXXXXXX)
else
tmpdir=$(mktemp -d --tmpdir=${WORKSPACE_TMP} $USER.XXXXXXXXXXXX)
fi
export CORALCOOL_QMTEST_WORKDIR=$tmpdir
echo "Using CORALCOOL_QMTEST_WORKDIR=${CORALCOOL_QMTEST_WORKDIR}"
tmpout=$tmpdir/results.qmr
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment