[Darshan-commits] [Darshan] branch, trac-150-regression, updated. darshan-2.3.1-pre1-11-g4ec192f

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, trac-150-regression has been updated
       via  4ec192f30eba792a9f40dbccd161352b38363369 (commit)
      from  ddfcbd5f31ac37be8a69062386ad40a3684242c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ec192f30eba792a9f40dbccd161352b38363369
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Tue Feb 3 21:27:36 2015 -0500

    more path cleanups

-----------------------------------------------------------------------

Summary of changes:
 darshan-test/regression/run-all.sh                |   17 +++++++++--------
 darshan-test/regression/test-cases/cxxpi.sh       |    3 +--
 darshan-test/regression/test-cases/fperf-f77.sh   |    2 +-
 darshan-test/regression/test-cases/fperf-f90.sh   |    2 +-
 darshan-test/regression/test-cases/mpi-io-test.sh |    2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)


Diff of changes:
diff --git a/darshan-test/regression/run-all.sh b/darshan-test/regression/run-all.sh
index cf28840..6b9ee5e 100755
--- a/darshan-test/regression/run-all.sh
+++ b/darshan-test/regression/run-all.sh
@@ -13,7 +13,8 @@ export DARSHAN_PLATFORM=$3
 # number of procs that most test jobs will use
 export DARSHAN_DEFAULT_NPROCS=4
 
-BASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DARSHAN_TESTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+export DARSHAN_TESTDIR
 
 # check darshan path
 if [ ! -x $DARSHAN_PATH/bin/darshan-parser ]; then
@@ -36,45 +37,45 @@ if [ ! -w $DARSHAN_TMP ]; then
 fi
 
 # make sure that we have sub-scripts for the specified platform
-if [ ! -d $BASEDIR/$DARSHAN_PLATFORM ]; then
+if [ ! -d $DARSHAN_TESTDIR/$DARSHAN_PLATFORM ]; then
     echo "Error: unable to find scripts for platform $DARSHAN_PLATFORM" 1>&2
     exit 1
 fi
 
 # set up c compiler for this platform
-DARSHAN_CC=`$BASEDIR/$DARSHAN_PLATFORM/setup-cc.sh`
+DARSHAN_CC=`$DARSHAN_TESTDIR/$DARSHAN_PLATFORM/setup-cc.sh`
 if [ $? -ne 0 ]; then
     exit 1
 fi
 export DARSHAN_CC
 
 # set up c++ compiler for this platform
-DARSHAN_CXX=`$BASEDIR/$DARSHAN_PLATFORM/setup-cxx.sh`
+DARSHAN_CXX=`$DARSHAN_TESTDIR/$DARSHAN_PLATFORM/setup-cxx.sh`
 if [ $? -ne 0 ]; then
     exit 1
 fi
 export DARSHAN_CXX
 
 # set up Fortran compilers for this platform
-DARSHAN_F77=`$BASEDIR/$DARSHAN_PLATFORM/setup-f77.sh`
+DARSHAN_F77=`$DARSHAN_TESTDIR/$DARSHAN_PLATFORM/setup-f77.sh`
 if [ $? -ne 0 ]; then
     exit 1
 fi
 export DARSHAN_F77
-DARSHAN_F90=`$BASEDIR/$DARSHAN_PLATFORM/setup-f90.sh`
+DARSHAN_F90=`$DARSHAN_TESTDIR/$DARSHAN_PLATFORM/setup-f90.sh`
 if [ $? -ne 0 ]; then
     exit 1
 fi
 export DARSHAN_F90
 
 # set up job execution wrapper for this platform
-DARSHAN_RUNJOB=`$BASEDIR/$DARSHAN_PLATFORM/setup-runjob.sh`
+DARSHAN_RUNJOB=`$DARSHAN_TESTDIR/$DARSHAN_PLATFORM/setup-runjob.sh`
 if [ $? -ne 0 ]; then
     exit 1
 fi
 export DARSHAN_RUNJOB
 
-for i in `ls $BASEDIR/test-cases/*.sh`; do
+for i in `ls $DARSHAN_TESTDIR/test-cases/*.sh`; do
     echo Running ${i}...
     $i
     if [ $? -ne 0 ]; then
diff --git a/darshan-test/regression/test-cases/cxxpi.sh b/darshan-test/regression/test-cases/cxxpi.sh
index 8151692..bea35e8 100755
--- a/darshan-test/regression/test-cases/cxxpi.sh
+++ b/darshan-test/regression/test-cases/cxxpi.sh
@@ -7,8 +7,7 @@ export DARSHAN_LOGFILE=$DARSHAN_TMP/${PROG}.darshan.gz
 rm -f ${DARSHAN_LOGFILE}
 
 # compile
-echo $DARSHAN_CXX test-cases/src/${PROG}.cxx -o $DARSHAN_TMP/${PROG}
-$DARSHAN_CXX test-cases/src/${PROG}.cxx -o $DARSHAN_TMP/${PROG}
+$DARSHAN_CXX $DARSHAN_TESTDIR/test-cases/src/${PROG}.cxx -o $DARSHAN_TMP/${PROG}
 if [ $? -ne 0 ]; then
     echo "Error: failed to compile ${PROG}" 1>&2
     exit 1
diff --git a/darshan-test/regression/test-cases/fperf-f77.sh b/darshan-test/regression/test-cases/fperf-f77.sh
index d056a04..8f123d7 100755
--- a/darshan-test/regression/test-cases/fperf-f77.sh
+++ b/darshan-test/regression/test-cases/fperf-f77.sh
@@ -7,7 +7,7 @@ export DARSHAN_LOGFILE=$DARSHAN_TMP/${PROG}.darshan.gz
 rm -f ${DARSHAN_LOGFILE}
 
 # compile
-$DARSHAN_F77 test-cases/src/fperf.f -o $DARSHAN_TMP/${PROG}
+$DARSHAN_F77 $DARSHAN_TESTDIR/test-cases/src/fperf.f -o $DARSHAN_TMP/${PROG}
 if [ $? -ne 0 ]; then
     echo "Error: failed to compile ${PROG}" 1>&2
     exit 1
diff --git a/darshan-test/regression/test-cases/fperf-f90.sh b/darshan-test/regression/test-cases/fperf-f90.sh
index af6a1b7..69dbd4f 100755
--- a/darshan-test/regression/test-cases/fperf-f90.sh
+++ b/darshan-test/regression/test-cases/fperf-f90.sh
@@ -7,7 +7,7 @@ export DARSHAN_LOGFILE=$DARSHAN_TMP/${PROG}.darshan.gz
 rm -f ${DARSHAN_LOGFILE}
 
 # compile
-$DARSHAN_F90 test-cases/src/fperf.f -o $DARSHAN_TMP/${PROG}
+$DARSHAN_F90 $DARSHAN_TESTDIR/test-cases/src/fperf.f -o $DARSHAN_TMP/${PROG}
 if [ $? -ne 0 ]; then
     echo "Error: failed to compile ${PROG}" 1>&2
     exit 1
diff --git a/darshan-test/regression/test-cases/mpi-io-test.sh b/darshan-test/regression/test-cases/mpi-io-test.sh
index a2c7651..82982c1 100755
--- a/darshan-test/regression/test-cases/mpi-io-test.sh
+++ b/darshan-test/regression/test-cases/mpi-io-test.sh
@@ -7,7 +7,7 @@ export DARSHAN_LOGFILE=$DARSHAN_TMP/${PROG}.darshan.gz
 rm -f ${DARSHAN_LOGFILE}
 
 # compile
-$DARSHAN_CC test-cases/src/${PROG}.c -o $DARSHAN_TMP/${PROG}
+$DARSHAN_CC $DARSHAN_TESTDIR/test-cases/src/${PROG}.c -o $DARSHAN_TMP/${PROG}
 if [ $? -ne 0 ]; then
     echo "Error: failed to compile ${PROG}" 1>&2
     exit 1


hooks/post-receive
--