remove absolute paths from test scripts

diff --git a/teshsuite/smpi/mpich-test/coll/runtests b/teshsuite/smpi/mpich-test/coll/runtests
index fe5080e..65c4908 100755 (executable)
--- a/teshsuite/smpi/mpich-test/coll/runtests
+++ b/teshsuite/smpi/mpich-test/coll/runtests
@@ -3,8 +3,6 @@
 # -mvhome is needed for the ANL SP, and is ignored by others
 args=
 device=
 # -mvhome is needed for the ANL SP, and is ignored by others
 args=
 device=

-#top_srcdir=/home/degomme/Downloads/mpich-test
-#srcdir=/home/degomme/Downloads/mpich-test/coll

 MPICH_VERSION=
 STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"}
 
 MPICH_VERSION=
 STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"}
 

diff --git a/teshsuite/smpi/mpich-test/profile/ptest.std b/teshsuite/smpi/mpich-test/profile/ptest.std
index 70c49f8..1c13f91 100644 (file)
--- a/teshsuite/smpi/mpich-test/profile/ptest.std
+++ b/teshsuite/smpi/mpich-test/profile/ptest.std
@@ -1,3 +1 @@
-**** Testing MPI_Pcontrol ****

 Pcontrol test passed
 Pcontrol test passed

-**** Testing MPI_Pcontrol ****

diff --git a/teshsuite/smpi/mpich-test/profile/runtests b/teshsuite/smpi/mpich-test/profile/runtests
index 57e8f59..051cf5f 100755 (executable)
--- a/teshsuite/smpi/mpich-test/profile/runtests
+++ b/teshsuite/smpi/mpich-test/profile/runtests
@@ -6,16 +6,13 @@
 # -mvhome is needed for the ANL SP, and is ignored by others
 args=
 device=
 # -mvhome is needed for the ANL SP, and is ignored by others
 args=
 device=

-top_srcdir=/home/degomme/Downloads/mpich-test
-srcdir=/home/degomme/Downloads/mpich-test/profile

 MPICH_VERSION=
 STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"}
 
 MAKE="make --no-print-directory"
 MPIRUNMVBACK=""
 #
 MPICH_VERSION=
 STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"}
 
 MAKE="make --no-print-directory"
 MPIRUNMVBACK=""
 #

-# Load basic procedures
-. ${top_srcdir}/runbase
+

 #
 # Set mpirun to the name/path of the mpirun program
 #FindMPIRUN
 #
 # Set mpirun to the name/path of the mpirun program
 #FindMPIRUN


@@ -46,7 +43,7 @@ for arg in "$@" ; do
        -checkonly)
        runtests=0
        ;;
        -checkonly)
        runtests=0
        ;;

-        -margs=*)
+    -margs=*)

        margs=`echo $arg | sed 's/-margs=//'`
        args="$args $margs"
        ;;
        margs=`echo $arg | sed 's/-margs=//'`
        args="$args $margs"
        ;;


@@ -85,11 +82,16 @@ for arg in "$@" ; do
        ;;
     esac
 done
        ;;
     esac
 done

+
+
+# Load basic procedures
+. ${srcdir}/../runbase
+

 mpirun=" ${basedir}/bin/smpirun -platform ${srcdir}/../../../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile  --log=root.thres:critical"
 # If the programs are not available, run make.
 mpirun=" ${basedir}/bin/smpirun -platform ${srcdir}/../../../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile  --log=root.thres:critical"
 # If the programs are not available, run make.

-if [ ! -x sendrecv -a $makeeach = 0 -a $runtests = 1 ] ; then
-    $MAKE default
-fi
+#if [ ! -x sendrecv -a $makeeach = 0 -a $runtests = 1 ] ; then
+#    $MAKE default
+#fi

 
 testfiles=""
 if [ $runtests = 1 ] ; then
 
 testfiles=""
 if [ $runtests = 1 ] ; then

diff --git a/teshsuite/smpi/mpich-test/pt2pt/runtests b/teshsuite/smpi/mpich-test/pt2pt/runtests
index 4d6de4c..c1eaf5f 100755 (executable)
--- a/teshsuite/smpi/mpich-test/pt2pt/runtests
+++ b/teshsuite/smpi/mpich-test/pt2pt/runtests
@@ -134,9 +134,9 @@ EOF
 fi
 
 # If the programs are not available, run make.
 fi
 
 # If the programs are not available, run make.

-if [ ! -x sendrecv_mpich -a $makeeach = 0 -a $runtests = 1 ] ; then
-    $MAKE
-fi
+#if [ ! -x sendrecv_mpich -a $makeeach = 0 -a $runtests = 1 ] ; then
+#    $MAKE
+#fi

 
 testfiles=""
 if [ $runtests = 1 ] ; then
 
 testfiles=""
 if [ $runtests = 1 ] ; then