Skip to content

Commit faca0d4

Browse files
committed
make check: when --log-path-by-env is used but not set at run time
In this case, fall back to the value set in --log-path
1 parent bee447e commit faca0d4

File tree

1 file changed

+30
-11
lines changed

1 file changed

+30
-11
lines changed

darshan-runtime/test/tst_runs.sh

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,6 @@
33
# Exit immediately if a command exits with a non-zero status.
44
set -e
55

6-
TODAY_DATE_PATH=`date "+%Y/%-m/%-d"`
7-
TST_DARSHAN_LOG_PATH="${TST_DARSHAN_LOG_PATH}/${TODAY_DATE_PATH}"
8-
mkdir -p ${TST_DARSHAN_LOG_PATH}
9-
10-
# check what file system is used
11-
echo "df -T ${TST_DARSHAN_LOG_PATH}"
12-
df -T ${TST_DARSHAN_LOG_PATH}
13-
14-
echo "findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}"
15-
findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}
16-
176
if test "x$USERNAME_ENV" = xno ; then
187
USERNAME_ENV=$USER
198
fi
@@ -31,6 +20,36 @@ else
3120
DARSHAN_CONFIG=../../darshan-util/darshan-config
3221
fi
3322
echo "DARSHAN_CONFIG=$DARSHAN_CONFIG"
23+
echo ""
24+
25+
TODAY_DATE_PATH=`date "+%Y/%-m/%-d"`
26+
LOG_PATH_ENV=`$DARSHAN_CONFIG --log-path-by-env`
27+
if test "x${LOG_PATH_ENV}" != x ; then
28+
if test "x${!LOG_PATH_ENV}" = x ; then
29+
echo ""
30+
echo "Warning: ---------------------------------------------------------"
31+
echo " Darshan was configure with --log-path-by-env set to $LOG_PATH_ENV"
32+
echo " but this run-time environment variable is currently not set !"
33+
echo " Darshan now uses the path set in configure option of --log-path :"
34+
echo " $TST_DARSHAN_LOG_PATH"
35+
echo "------------------------------------------------------------------"
36+
echo ""
37+
TST_DARSHAN_LOG_PATH="${TST_DARSHAN_LOG_PATH}/${TODAY_DATE_PATH}"
38+
else
39+
TST_DARSHAN_LOG_PATH="${!LOG_PATH_ENV}"
40+
fi
41+
else
42+
TST_DARSHAN_LOG_PATH="${TST_DARSHAN_LOG_PATH}/${TODAY_DATE_PATH}"
43+
fi
44+
echo "TST_DARSHAN_LOG_PATH=$TST_DARSHAN_LOG_PATH"
45+
mkdir -p ${TST_DARSHAN_LOG_PATH}
46+
47+
# check what file system is used
48+
echo "df -T ${TST_DARSHAN_LOG_PATH}"
49+
df -T ${TST_DARSHAN_LOG_PATH}
50+
51+
echo "findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}"
52+
findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}
3453

3554
$DARSHAN_CONFIG --all
3655

0 commit comments

Comments
 (0)