Minor cleanup. Really use /dev/shm now.

master
Julian M. Kunkel 2018-07-07 00:43:24 +01:00
parent c57f809654
commit fabc74759e
5 changed files with 22 additions and 85 deletions

View File

@ -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))
}

View File

@ -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

View File

@ -0,0 +1 @@
../centos7/run-test.sh

View File

@ -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

View File

@ -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

View File

@ -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