From 231ebe96706af0e89571ac69bded4f8a0ca314c9 Mon Sep 17 00:00:00 2001
From: "Julian M. Kunkel" <juliankunkel@googlemail.com>
Date: Sat, 7 Jul 2018 11:57:10 +0100
Subject: [PATCH] Split test.

---
 testing/basic-tests.sh      | 80 ++-----------------------------------
 testing/bug-multi-node.conf | 18 +++++++++
 testing/complex-tests.sh    | 25 ++++++++++++
 testing/test-lib.sh         | 74 ++++++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+), 76 deletions(-)
 create mode 100644 testing/bug-multi-node.conf
 create mode 100755 testing/complex-tests.sh
 create mode 100644 testing/test-lib.sh

diff --git a/testing/basic-tests.sh b/testing/basic-tests.sh
index 00978e9..e53c091 100755
--- a/testing/basic-tests.sh
+++ b/testing/basic-tests.sh
@@ -6,65 +6,9 @@
 # You can override the defaults by setting the variables before invoking the script, or simply set them here...
 # Example: export IOR_EXTRA="-v -v -v"
 
-IOR_MPIRUN=${IOR_MPIRUN:-mpiexec -np}
-IOR_BIN_DIR=${IOR_BIN_DIR:-./build/src}
-IOR_OUT=${IOR_OUT:-./build/test}
-IOR_EXTRA=${IOR_EXTRA:-} # Add global options like verbosity
-MDTEST_EXTRA=${MDTEST_EXTRA:-}
+ROOT=${0%/*}
 
-################################################################################
-mkdir -p ${IOR_OUT}
-
-## Sanity check
-
-if [[ ! -e ${IOR_OUT} ]]; then
-  echo "Could not create output dir ${IOR_OUT}"
-  exit 1
-fi
-
-if [[ ! -e ${IOR_BIN_DIR}/ior ]]; then
-  echo "IOR Executable \"${IOR_BIN_DIR}/ior\" does not exist! Call me from the root directory!"
-  exit 1
-fi
-
-if [[ ! -e ${IOR_BIN_DIR}/mdtest ]]; then
-  echo "MDTest Executable \"${IOR_BIN_DIR}/mdtest\" does not exist! Call me from the root directory!"
-  exit 1
-fi
-
-
-
-ERRORS=0 # Number of errors detected while running
-I=0
-function IOR(){
-  RANKS=$1
-  shift
-  WHAT="${IOR_MPIRUN} $RANKS ${IOR_BIN_DIR}/ior ${@} ${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 " $WHAT"
-  I=$((${I}+1))
-}
-
-function MDTEST(){
-  RANKS=$1
-  shift
-  WHAT="${IOR_MPIRUN} $RANKS ${IOR_BIN_DIR}/mdtest ${@} ${MDTEST_EXTRA} -d /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 " $WHAT"
-  I=$((${I}+1))
-}
+source $ROOT/test-lib.sh
 
 MDTEST 1 -a POSIX
 
@@ -72,26 +16,10 @@ IOR 1 -a POSIX -w    -z                  -F -Y -e -i1 -m -t 100k -b 1000k
 IOR 1 -a POSIX -w    -z                  -F -k -e -i2 -m -t 100k -b 100k
 IOR 1 -a POSIX -r    -z                  -F -k -e -i1 -m -t 100k -b 100k
 
-IOR 2 -a POSIX -w    -z  -C              -F -k -e -i1 -m -t 100k -b 100k
+IOR 2 -a POSIX -w    -z  -C             -F -k -e -i1 -m -t 100k -b 100k
 IOR 2 -a POSIX -w    -z  -C -Q 1        -F -k -e -i1 -m -t 100k -b 100k
 IOR 2 -a POSIX -r    -z  -Z -Q 2        -F -k -e -i1 -m -t 100k -b 100k
 IOR 2 -a POSIX -r    -z  -Z -Q 3 -X  13 -F -k -e -i1 -m -t 100k -b 100k
 IOR 2 -a POSIX -w    -z  -Z -Q 1 -X -13 -F    -e -i1 -m -t 100k -b 100k
 
-#shared tests
-IOR 2 -a POSIX -w    -z                     -Y -e -i1 -m -t 100k -b 100k
-IOR 2 -a POSIX -w                            -k -e -i1 -m -t 100k -b 100k
-IOR 2 -a POSIX -r    -z                      -k -e -i1 -m -t 100k -b 100k
-
-#test mutually exclusive options
-IOR 2 -a POSIX -w    -z                    -k -e -i1 -m -t 100k -b 100k
-IOR 2 -a POSIX -w    -z  -                 -k -e -i1 -m -t 100k -b 100k
-IOR 2 -a POSIX -w -Z                             -i1 -m -t 100k -b 100k  -d 0.1
-
-if [[ ${ERRORS} == 0 ]] ; then
-  echo "PASSED"
-else
-  echo "Error, check the output files!"
-fi
-
-exit ${ERRORS}
+END
diff --git a/testing/bug-multi-node.conf b/testing/bug-multi-node.conf
new file mode 100644
index 0000000..1f79715
--- /dev/null
+++ b/testing/bug-multi-node.conf
@@ -0,0 +1,18 @@
+IOR START
+reorderTasksConstant=1
+repetitions=1
+segmentCount=1
+verbose=0
+fsync=0
+checkWrite=1
+blockSize=16
+setTimeStampSignature=1511817315
+checkRead=0
+readFile=1
+filePerProc=0
+writeFile=1
+transferSize=16
+intraTestBarriers=0
+
+RUN
+IOR STOP
diff --git a/testing/complex-tests.sh b/testing/complex-tests.sh
new file mode 100755
index 0000000..665727b
--- /dev/null
+++ b/testing/complex-tests.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Test script for more complex IOR functionality testing various patterns
+# You can override the defaults by setting the variables before invoking the script, or simply set them here...
+# Example: export IOR_EXTRA="-v -v -v"
+
+ROOT=${0%/*}
+
+source $ROOT/test-lib.sh
+
+#shared tests
+IOR 2 -a POSIX -w -z -Y -e -i1 -m -t 100k -b 100k
+IOR 2 -a POSIX -w -k -e -i1 -m -t 100k -b 100k
+IOR 2 -a POSIX -r -z-k -e -i1 -m -t 100k -b 100k
+
+#test mutually exclusive options
+IOR 2 -a POSIX -w -z -k -e -i1 -m -t 100k -b 100k
+IOR 2 -a POSIX -w -z -k -e -i1 -m -t 100k -b 100k
+IOR 2 -a POSIX -w -Z -i1 -m -t 100k -b 100k -d 0.1
+
+# Now set the num tasks per node to 1:
+export IOR_FAKE_TASK_PER_NODES=1
+IOR 2 -a POSIX -f $ROOT/bug-multi-node.conf
+
+END
diff --git a/testing/test-lib.sh b/testing/test-lib.sh
new file mode 100644
index 0000000..54ab0b2
--- /dev/null
+++ b/testing/test-lib.sh
@@ -0,0 +1,74 @@
+# Test script for basic IOR functionality testing various patterns
+# It is kept as simple as possible and outputs the parameters used such that any test can be rerun easily.
+
+# You can override the defaults by setting the variables before invoking the script, or simply set them here...
+# Example: export IOR_EXTRA="-v -v -v"
+
+IOR_MPIRUN=${IOR_MPIRUN:-mpiexec -np}
+IOR_BIN_DIR=${IOR_BIN_DIR:-./build/src}
+IOR_OUT=${IOR_OUT:-./build/test}
+IOR_EXTRA=${IOR_EXTRA:-} # Add global options like verbosity
+MDTEST_EXTRA=${MDTEST_EXTRA:-}
+
+################################################################################
+mkdir -p ${IOR_OUT}
+mkdir -p /dev/shm/mdest
+
+## Sanity check
+
+if [[ ! -e ${IOR_OUT} ]]; then
+  echo "Could not create output dir ${IOR_OUT}"
+  exit 1
+fi
+
+if [[ ! -e ${IOR_BIN_DIR}/ior ]]; then
+  echo "IOR Executable \"${IOR_BIN_DIR}/ior\" does not exist! Call me from the root directory!"
+  exit 1
+fi
+
+if [[ ! -e ${IOR_BIN_DIR}/mdtest ]]; then
+  echo "MDTest Executable \"${IOR_BIN_DIR}/mdtest\" does not exist! Call me from the root directory!"
+  exit 1
+fi
+
+ERRORS=0 # Number of errors detected while running
+I=0
+function IOR(){
+  RANKS=$1
+  shift
+  WHAT="${IOR_MPIRUN} $RANKS ${IOR_BIN_DIR}/ior ${@} ${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 " $WHAT"
+  I=$((${I}+1))
+}
+
+function MDTEST(){
+  RANKS=$1
+  shift
+  WHAT="${IOR_MPIRUN} $RANKS ${IOR_BIN_DIR}/mdtest ${@} ${MDTEST_EXTRA} -d /dev/shm/mdest"
+  $WHAT 1>${IOR_OUT}/$I 2>&1
+  if [[ $? != 0 ]]; then
+    echo -n "ERR"
+    ERRORS=$(($ERRORS + 1))
+  else
+    echo -n "OK "
+  fi
+  echo " $WHAT"
+  I=$((${I}+1))
+}
+
+function END(){
+  if [[ ${ERRORS} == 0 ]] ; then
+    echo "PASSED"
+  else
+    echo "Error, check the output files!"
+  fi
+
+  exit ${ERRORS}
+}