From fabc74759e93b536ea0c947a18dd4bdf7be64883 Mon Sep 17 00:00:00 2001
From: "Julian M. Kunkel" <juliankunkel@googlemail.com>
Date: Sat, 7 Jul 2018 00:43:24 +0100
Subject: [PATCH] Minor cleanup. Really use /dev/shm now.

---
 testing/basic-tests.sh                 |  5 +--
 testing/docker/centos6/run-test.sh     | 45 +-------------------------
 testing/docker/centos7/run-test.sh     | 21 ++++--------
 testing/docker/ubuntu14.04/run-test.sh | 19 ++++-------
 testing/docker/ubuntu16.04/run-test.sh | 17 +++-------
 5 files changed, 22 insertions(+), 85 deletions(-)
 mode change 100755 => 120000 testing/docker/centos6/run-test.sh

diff --git a/testing/basic-tests.sh b/testing/basic-tests.sh
index 3c4ffe7..adcfbc7 100755
--- a/testing/basic-tests.sh
+++ b/testing/basic-tests.sh
@@ -30,14 +30,15 @@ fi
 ERRORS=0 # Number of errors detected while running
 I=0
 function TEST(){
-  ${IOR_MPIRUN} ${@} ${IOR_EXTRA} 1>${IOR_OUT}/$I 2>&1
+  WHAT="${IOR_MPIRUN} ${@} ${IOR_EXTRA} -o /dev/shm/ior"
+  $WHAT 1>${IOR_OUT}/$I 2>&1
   if [[ $? != 0 ]]; then
     echo -n "ERR"
     ERRORS=$(($ERRORS + 1))
   else
     echo -n "OK "
   fi
-  echo " ${IOR_OUT}/${I} ${IOR_MPIRUN} ${@} -o /dev/shm/ior"
+  echo " $WHAT"
   I=$((${I}+1))
 }
 
diff --git a/testing/docker/centos6/run-test.sh b/testing/docker/centos6/run-test.sh
deleted file mode 100755
index 387997c..0000000
--- a/testing/docker/centos6/run-test.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-BUILD="$1"
-if [[ $UID == 0 ]]; then
-  groupadd -g $3 testuser
-  useradd -r -u $2 -g testuser testuser
-  sudo -u testuser $0 $1
-  exit $?
-fi
-
-ERROR=0
-
-function runTest(){
-  P=$PATH
-  FLAVOR="$1"
-  MPI_DIR="$2"
-	export IOR_MPIRUN="$3"
-
-  echo $FLAVOR in $BUILD/$FLAVOR
-  export PATH=$MPI_DIR/bin:$PATH
-	mkdir -p $BUILD/$FLAVOR
-
-	pushd $BUILD/$FLAVOR > /dev/null
-  /data/configure || exit 1
-  make || exit 1
-
-	cd /data/
-	export IOR_EXEC=$BUILD/$FLAVOR/src/ior
-	export IOR_OUT=$BUILD/$FLAVOR/test
-	./testing/basic-tests.sh
-
-  ERROR=$(($ERROR + $?))
-  popd  > /dev/null
-  PATH=$P
-}
-
-
-runTest openmpi /usr/lib64/openmpi/ "mpiexec -n"
-export MPI_ARGS=""
-runTest mpich /usr/lib64/mpich "mpiexec -n"
-
-#kill -9 %1
-
-exit $ERROR
diff --git a/testing/docker/centos6/run-test.sh b/testing/docker/centos6/run-test.sh
new file mode 120000
index 0000000..7809c21
--- /dev/null
+++ b/testing/docker/centos6/run-test.sh
@@ -0,0 +1 @@
+../centos7/run-test.sh
\ No newline at end of file
diff --git a/testing/docker/centos7/run-test.sh b/testing/docker/centos7/run-test.sh
index 088fcb0..6568a0e 100755
--- a/testing/docker/centos7/run-test.sh
+++ b/testing/docker/centos7/run-test.sh
@@ -2,13 +2,8 @@
 
 BUILD="$1"
 
-if [[ $UID == 0 ]]; then
-  groupadd -g $3 testuser
-  useradd -r -u $2 -g testuser testuser
-  sudo -u testuser $0 $1
-  exit $?
-fi
-
+groupadd -g $3 testuser
+useradd -r -u $2 -g testuser testuser
 ERROR=0
 
 function runTest(){
@@ -17,18 +12,16 @@ function runTest(){
   MPI_DIR="$2"
 
   echo $FLAVOR in $BUILD/$FLAVOR
-	mkdir -p $BUILD/$FLAVOR
+	sudo -u testuser mkdir -p $BUILD/$FLAVOR
 
 	pushd $BUILD/$FLAVOR > /dev/null
-  
+
   export PATH=$MPI_DIR/bin:$PATH
-  /data/configure || exit 1
-  make || exit 1
+  sudo -u testuser PATH=$PATH /data/configure || exit 1
+  sudo -u testuser PATH=$PATH make || exit 1
 
 	cd /data/
-	export IOR_EXEC=$BUILD/$FLAVOR/src/ior
-	export IOR_OUT=$BUILD/$FLAVOR/test
-	./testing/basic-tests.sh
+	sudo -u testuser PATH=$PATH IOR_EXEC=$BUILD/$FLAVOR/src/ior IOR_OUT=$BUILD/$FLAVOR/test ./testing/basic-tests.sh
 
   ERROR=$(($ERROR + $?))
   popd  > /dev/null
diff --git a/testing/docker/ubuntu14.04/run-test.sh b/testing/docker/ubuntu14.04/run-test.sh
index b7084c5..3639ae1 100755
--- a/testing/docker/ubuntu14.04/run-test.sh
+++ b/testing/docker/ubuntu14.04/run-test.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 
 BUILD="$1"
-if [[ $UID == 0 ]]; then
-  groupadd -g $3 testuser
-  useradd -r -u $2 -g testuser testuser
-  sudo -u testuser $0 $1
-  exit $?
-fi
+groupadd -g $3 testuser
+useradd -r -u $2 -g testuser testuser
+
 ERROR=0
 
 function runTest(){
@@ -14,19 +11,17 @@ function runTest(){
   MPI_DIR="$2"
   echo $FLAVOR in $BUILD/$FLAVOR
   update-alternatives --set mpi $MPI_DIR
-	mkdir -p $BUILD/$FLAVOR
+	sudo -u testuser mkdir -p $BUILD/$FLAVOR
 
 	pushd $BUILD/$FLAVOR > /dev/null
-  /data/configure || exit 1
-  make || exit 1
+  sudo -u testuser /data/configure || exit 1
+  sudo -u testuser make || exit 1
 
   #define the alias
   ln -sf $(which mpiexec.$FLAVOR) /usr/bin/mpiexec
 
 	cd /data/
-	export IOR_EXEC=$BUILD/$FLAVOR/src/ior
-	export IOR_OUT=$BUILD/$FLAVOR/test
-	./testing/basic-tests.sh
+	sudo -u testuser IOR_EXEC=$BUILD/$FLAVOR/src/ior IOR_OUT=$BUILD/$FLAVOR/test ./testing/basic-tests.sh
 
   ERROR=$(($ERROR + $?))
   popd  > /dev/null
diff --git a/testing/docker/ubuntu16.04/run-test.sh b/testing/docker/ubuntu16.04/run-test.sh
index 950bdaa..03fb99c 100755
--- a/testing/docker/ubuntu16.04/run-test.sh
+++ b/testing/docker/ubuntu16.04/run-test.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
 
 BUILD="$1"
-if [[ $UID == 0 ]]; then
-  groupadd -g $3 testuser
-  useradd -r -u $2 -g testuser testuser
-  sudo -u testuser $0 $1
-  exit $?
-fi
 groupadd -g $3 testuser
 useradd -r -u $2 -g testuser testuser
-
 ERROR=0
 
 function runTest(){
@@ -18,20 +11,18 @@ function runTest(){
 	export IOR_MPIRUN="$3"
   echo $FLAVOR in $BUILD/$FLAVOR
   update-alternatives --set mpi $MPI_DIR
-	mkdir -p $BUILD/$FLAVOR
+	sudo -u testuser mkdir -p $BUILD/$FLAVOR
 
 	pushd $BUILD/$FLAVOR > /dev/null
-  /data/configure || exit 1
-  make || exit 1
+  sudo -u testuser /data/configure || exit 1
+  sudo -u testuser make || exit 1
 
   #define the alias
   ln -sf $(which mpiexec.$FLAVOR) /usr/bin/mpiexec
 
 	cd /data/
-	export IOR_EXEC=$BUILD/$FLAVOR/src/ior
-	export IOR_OUT=$BUILD/$FLAVOR/test
 
-	./testing/basic-tests.sh
+	sudo -u testuser IOR_EXEC=$BUILD/$FLAVOR/src/ior IOR_OUT=$BUILD/$FLAVOR/test ./testing/basic-tests.sh
 
   ERROR=$(($ERROR + $?))
   popd  > /dev/null