Commit b50b656d authored by Shane Snyder's avatar Shane Snyder
Browse files

update regr. testing to use darshan-posix-parser

parent 1fc4876f
...@@ -17,7 +17,7 @@ DARSHAN_TESTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) ...@@ -17,7 +17,7 @@ DARSHAN_TESTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
export DARSHAN_TESTDIR export DARSHAN_TESTDIR
# check darshan path # check darshan path
if [ ! -x $DARSHAN_PATH/bin/darshan-parser ]; then if [ ! -x $DARSHAN_PATH/bin/darshan-posix-parser ]; then
echo "Error: $DARSHAN_PATH doesn't contain a valid Darshan install." 1>&2 echo "Error: $DARSHAN_PATH doesn't contain a valid Darshan install." 1>&2
exit 1 exit 1
fi fi
......
...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then ...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi fi
# parse log # parse log
$DARSHAN_PATH/bin/darshan-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt $DARSHAN_PATH/bin/darshan-posix-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2 echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2
exit 1 exit 1
...@@ -29,10 +29,16 @@ fi ...@@ -29,10 +29,16 @@ fi
# check results # check results
# in this case we want to confirm that the open counts are zero; cxxpi does not do any IO # in this case we want to confirm that the open counts are zero; cxxpi does not do any IO
POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4` #POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4`
#if [ "$POSIX_OPENS"x != ""x ]; then
# echo "Error: Found unexpected POSIX open count of $POSIX_OPENS" 1>&2
# exit 1
#fi
POSIX_OPENS=`grep POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -d : -f 2 |xargs`
if [ "$POSIX_OPENS"x != ""x ]; then if [ "$POSIX_OPENS"x != ""x ]; then
echo "Error: Found unexpected POSIX open count of $POSIX_OPENS" 1>&2 echo "Error: Found unexpected POSIX open count of $POSIX_OPENS" 1>&2
exit 1 exit 1
fi fi
exit 0 exit 0
...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then ...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi fi
# parse log # parse log
$DARSHAN_PATH/bin/darshan-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt $DARSHAN_PATH/bin/darshan-posix-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2 echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2
exit 1 exit 1
...@@ -34,10 +34,16 @@ fi ...@@ -34,10 +34,16 @@ fi
# echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2 # echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2
# exit 1 # exit 1
#fi #fi
POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4` #POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4`
#if [ ! $POSIX_OPENS -gt 0 ]; then
# echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
# exit 1
#fi
POSIX_OPENS=`grep POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -d : -f 2 |xargs`
if [ ! $POSIX_OPENS -gt 0 ]; then if [ ! $POSIX_OPENS -gt 0 ]; then
echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2 echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
exit 1 exit 1
fi fi
exit 0 exit 0
...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then ...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi fi
# parse log # parse log
$DARSHAN_PATH/bin/darshan-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt $DARSHAN_PATH/bin/darshan-posix-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2 echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2
exit 1 exit 1
...@@ -34,10 +34,16 @@ fi ...@@ -34,10 +34,16 @@ fi
# echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2 # echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2
# exit 1 # exit 1
#fi #fi
POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4` #POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4`
#if [ ! $POSIX_OPENS -gt 0 ]; then
# echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
# exit 1
#fi
POSIX_OPENS=`grep POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -d : -f 2 |xargs`
if [ ! $POSIX_OPENS -gt 0 ]; then if [ ! $POSIX_OPENS -gt 0 ]; then
echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2 echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
exit 1 exit 1
fi fi
exit 0 exit 0
...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then ...@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi fi
# parse log # parse log
$DARSHAN_PATH/bin/darshan-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt $DARSHAN_PATH/bin/darshan-posix-parser $DARSHAN_LOGFILE > $DARSHAN_TMP/${PROG}.darshan.txt
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2 echo "Error: failed to parse ${DARSHAN_LOGFILE}" 1>&2
exit 1 exit 1
...@@ -34,11 +34,17 @@ fi ...@@ -34,11 +34,17 @@ fi
# echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2 # echo "Error: MPI open count of $MPI_OPENS is incorrect" 1>&2
# exit 1 # exit 1
#fi #fi
POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4` #POSIX_OPENS=`grep CP_POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -f 4`
#if [ ! $POSIX_OPENS -gt 0 ]; then
# echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
# exit 1
#fi
POSIX_OPENS=`grep POSIX_OPENS $DARSHAN_TMP/${PROG}.darshan.txt |cut -d : -f 2 |xargs`
if [ ! $POSIX_OPENS -gt 0 ]; then if [ ! $POSIX_OPENS -gt 0 ]; then
echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2 echo "Error: POSIX open count of $POSIX_OPENS is incorrect" 1>&2
exit 1 exit 1
fi fi
exit 0 exit 0
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