From f22f1668f3e74e743d2f04a2fcb18dbef7436f17 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 9 Aug 2018 12:30:43 +0200
Subject: [PATCH] fix some rebase fallout

---
 tests/run-init-regressionTest.sh     | 2 +-
 tests/run-parallel-regressionTest.sh | 4 ++--
 tests/run-porv-acceptanceTest.sh     | 2 +-
 tests/run-regressionTest.sh          | 2 +-
 tests/run-restart-regressionTest.sh  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/run-init-regressionTest.sh b/tests/run-init-regressionTest.sh
index 6a5910e7a..33abe6ec2 100755
--- a/tests/run-init-regressionTest.sh
+++ b/tests/run-init-regressionTest.sh
@@ -22,7 +22,7 @@ rm -Rf  ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
 if test "${EXE_NAME}" = "flow"; then
-    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --ecl-output-dir=${RESULT_PATH}
+    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH}
 else
     ${BINPATH}/${EXE_NAME} ${TEST_ARGS} nosim=true output_dir=${RESULT_PATH}
 fi
diff --git a/tests/run-parallel-regressionTest.sh b/tests/run-parallel-regressionTest.sh
index d2f62873a..005e9796e 100755
--- a/tests/run-parallel-regressionTest.sh
+++ b/tests/run-parallel-regressionTest.sh
@@ -20,7 +20,7 @@ rm -Rf ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
 if test "${EXE_NAME}" = "flow"; then
-    ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-output-dir=${RESULT_PATH}
+    ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --output-dir=${RESULT_PATH}
 else
     ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA linear_solver_reduction=1e-7 tolerance_cnv=5e-6 tolerance_mb=1e-8 output_dir=${RESULT_PATH}
 fi
@@ -29,7 +29,7 @@ test $? -eq 0 || exit 1
 mkdir mpi
 cd mpi
 if test "${EXE_NAME}" = "flow"; then
-    mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-output-dir=${RESULT_PATH}/mpi
+    mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --output-dir=${RESULT_PATH}/mpi
 else
     mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA linear_solver_reduction=1e-7 tolerance_cnv=5e-6 tolerance_mb=1e-8 output_dir=${RESULT_PATH}/mpi
 fi
diff --git a/tests/run-porv-acceptanceTest.sh b/tests/run-porv-acceptanceTest.sh
index 1d0bf2fec..b4dd46ee4 100755
--- a/tests/run-porv-acceptanceTest.sh
+++ b/tests/run-porv-acceptanceTest.sh
@@ -22,7 +22,7 @@ rm -Rf  ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
 if test "${EXE_NAME}" = "flow"; then
-    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --ecl-output-dir=${RESULT_PATH}
+    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH}
 else
     ${BINPATH}/${EXE_NAME} ${TEST_ARGS} nosim=true output_dir=${RESULT_PATH}
 fi
diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh
index 519a9b570..834660213 100755
--- a/tests/run-regressionTest.sh
+++ b/tests/run-regressionTest.sh
@@ -18,7 +18,7 @@ TEST_ARGS="$@"
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
 if test "${EXE_NAME}" = "flow"; then
-    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --ecl-output-dir=${RESULT_PATH}
+    ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --output-dir=${RESULT_PATH}
 else
     ${BINPATH}/${EXE_NAME} ${TEST_ARGS} output_dir=${RESULT_PATH}
 fi
diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh
index 313e29559..3c21ecf8a 100755
--- a/tests/run-restart-regressionTest.sh
+++ b/tests/run-restart-regressionTest.sh
@@ -30,7 +30,7 @@ else
   CMD_PREFIX=""
 fi
 if test "${EXE_NAME}" = "flow"; then
-    ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --enable-adaptive-time-stepping=false --ecl-output-dir=${RESULT_PATH}
+    ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH}
 else
     ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false output_dir=${RESULT_PATH}
 fi
@@ -40,7 +40,7 @@ test $? -eq 0 || exit 1
 ${OPM_PACK_COMMAND} -o ${BASE_NAME} ${TEST_ARGS}_RESTART.DATA
 
 if test "${EXE_NAME}" = "flow"; then
-    ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --enable-adaptive-time-stepping=false --ecl-output-dir=${RESULT_PATH}
+    ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH}
 else
     ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${BASE_NAME} timestep.adaptive=false output_dir=${RESULT_PATH}
 fi