check file system of log folder; allow env variable NP

Author: wkliao

darshan-runtime/test/Makefile.am

@@ -14,6 +14,7 @@ endif
 
 AM_TESTS_ENVIRONMENT  = export TESTMPIRUN="$(TESTMPIRUN)";
 AM_TESTS_ENVIRONMENT += export TST_DARSHAN_LOG_PATH="$(__DARSHAN_LOG_PATH)";
+AM_TESTS_ENVIRONMENT += export DARSHAN_INSTALL_DIR="$(prefix)";
 AM_TESTS_ENVIRONMENT += export USERNAME_ENV="$(USERNAME_ENV)";
 AM_TESTS_ENVIRONMENT += export HAVE_MPI_LARGE_COUNT="$(HAVE_MPI_LARGE_COUNT)";
 AM_TESTS_ENVIRONMENT += export check_PROGRAMS="$(check_PROGRAMS)";

darshan-runtime/test/tst_runs.sh

@@ -7,15 +7,29 @@ TODAY_DATE_PATH=`date "+%Y/%-m/%-d"`
 TST_DARSHAN_LOG_PATH="${TST_DARSHAN_LOG_PATH}/${TODAY_DATE_PATH}"
 mkdir -p ${TST_DARSHAN_LOG_PATH}
 
+# check what file system is used
+echo "df -T ${TST_DARSHAN_LOG_PATH}"
+df -T ${TST_DARSHAN_LOG_PATH}
+
+echo "findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}"
+findmnt -n -o FSTYPE --target ${TST_DARSHAN_LOG_PATH}
+
 if test "x$USERNAME_ENV" = xno ; then
    USERNAME_ENV=$USER
 fi
 
-DARSHAN_PARSER=../../darshan-util/darshan-parser
+if test -f $DARSHAN_INSTALL_DIR/bin/darshan-parser ; then
+   DARSHAN_PARSER=$DARSHAN_INSTALL_DIR/bin/darshan-parser
+else
+   DARSHAN_PARSER=../../darshan-util/darshan-parser
+fi
+echo "DARSHAN_PARSER=$DARSHAN_PARSER"
 
 # run NP number of MPI processes
 # Note when using OpenMPI, setting NP > 2 will fail.
-NP=2
+if test "x$NP" = x ; then
+   NP=2
+fi
 
 TEST_FILE=./testfile.dat
 
@@ -227,7 +241,12 @@ done
 
 echo "OPTS=$OPTS"
 
-export LD_PRELOAD=../lib/.libs/libdarshan.so
+if test -f $DARSHAN_INSTALL_DIR/lib/libdarshan.so ; then
+   export LD_PRELOAD=$DARSHAN_INSTALL_DIR/lib/libdarshan.so
+else
+   export LD_PRELOAD=../lib/.libs/libdarshan.so
+fi
+echo "LD_PRELOAD=$LD_PRELOAD"
 
 for exe in ${check_PROGRAMS} ; do
 
@@ -243,9 +262,11 @@ for exe in ${check_PROGRAMS} ; do
           else
              CMD="${TESTMPIRUN} -n ${NP} ./$exe -$opt $TEST_FILE"
           fi
-          # echo "CMD=$CMD"
+          echo "CMD=$CMD"
           rm -f $TEST_FILE $DARSHAN_LOG_FILE
           $CMD
+
+          echo "parsing ${DARSHAN_LOG_FILE}"
           EXPECT_NBYTE=`stat -c %s $TEST_FILE`
           nbytes=`$DARSHAN_PARSER ${DARSHAN_LOG_FILE} | grep $DARSGAN_FIELD | cut -f5`
           # echo "EXPECT_NBYTE=$EXPECT_NBYTE nbytes=$nbytes"
@@ -263,9 +284,11 @@ for exe in ${check_PROGRAMS} ; do
           else
              CMD="${TESTMPIRUN} -n ${NP} ./$exe -$opt -i $TEST_FILE"
           fi
-          # echo "CMD=$CMD"
+          echo "CMD=$CMD"
           rm -f $DARSHAN_LOG_FILE
           $CMD
+
+          echo "parsing ${DARSHAN_LOG_FILE}"
           nbytes=`$DARSHAN_PARSER ${DARSHAN_LOG_FILE} | grep $DARSGAN_FIELD | cut -f5`
           # echo "EXPECT_NBYTE=$EXPECT_NBYTE nbytes=$nbytes"
           if test "x$nbytes" != "x$EXPECT_NBYTE" ; then