From a262506f681c87cb68df22fe370deb7c3ddfc2f6 Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Tue, 31 Oct 2017 18:48:19 +0000
Subject: [PATCH] update test reporting

---
 configuration/scripts/cice.build                |  2 ++
 configuration/scripts/machines/Macros.conrad    |  6 +++---
 configuration/scripts/machines/Macros.gordon    |  6 +++---
 configuration/scripts/machines/Macros.onyx      |  6 +++---
 configuration/scripts/tests/test_restart.script | 10 ++++++++++
 configuration/scripts/tests/test_smoke.script   |  6 ++++++
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/configuration/scripts/cice.build b/configuration/scripts/cice.build
index bdefa759a..f53121cc6 100755
--- a/configuration/scripts/cice.build
+++ b/configuration/scripts/cice.build
@@ -99,6 +99,7 @@ if ($status != 0) then
   if ( ${ICE_TEST} != ${ICE_SPVAL} ) then
     # This is a test case.  Write output to test_output file
     echo "FAIL ${ICE_TESTNAME} build" >> ${ICE_CASEDIR}/test_output
+    echo "FAIL ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output
   endif
   exit 99
 endif
@@ -109,5 +110,6 @@ echo "`date` ${0}:${ICE_CASENAME} build completed ${ICE_BLDLOG_FILE}"  >> ${ICE_
 echo "${0}: COMPILE SUCCESSFUL, ${ICE_LOGDIR}/${ICE_BLDLOG_FILE}"
 if ( ${ICE_TEST} != ${ICE_SPVAL} ) then
   echo "PASS ${ICE_TESTNAME} build" >> ${ICE_CASEDIR}/test_output
+  echo "PEND ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output
 endif
 
diff --git a/configuration/scripts/machines/Macros.conrad b/configuration/scripts/machines/Macros.conrad
index 848b59f07..191da715a 100644
--- a/configuration/scripts/machines/Macros.conrad
+++ b/configuration/scripts/machines/Macros.conrad
@@ -49,9 +49,9 @@ SCC:= icc
 SFC:= ifort 
 
 ifeq ($(ICE_THREADED), true) 
-   LDFLAGS += -openmp
-   CFLAGS += -openmp
-   FFLAGS += -openmp
+   LDFLAGS += -qopenmp
+   CFLAGS += -qopenmp
+   FFLAGS += -qopenmp
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
diff --git a/configuration/scripts/machines/Macros.gordon b/configuration/scripts/machines/Macros.gordon
index e5fa4256b..d1ed9cda7 100644
--- a/configuration/scripts/machines/Macros.gordon
+++ b/configuration/scripts/machines/Macros.gordon
@@ -49,9 +49,9 @@ SCC:= icc
 SFC:= ifort 
 
 ifeq ($(ICE_THREADED), true) 
-   LDFLAGS += -openmp
-   CFLAGS += -openmp
-   FFLAGS += -openmp
+   LDFLAGS += -qopenmp
+   CFLAGS += -qopenmp
+   FFLAGS += -qopenmp
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
diff --git a/configuration/scripts/machines/Macros.onyx b/configuration/scripts/machines/Macros.onyx
index 848b59f07..191da715a 100644
--- a/configuration/scripts/machines/Macros.onyx
+++ b/configuration/scripts/machines/Macros.onyx
@@ -49,9 +49,9 @@ SCC:= icc
 SFC:= ifort 
 
 ifeq ($(ICE_THREADED), true) 
-   LDFLAGS += -openmp
-   CFLAGS += -openmp
-   FFLAGS += -openmp
+   LDFLAGS += -qopenmp
+   CFLAGS += -qopenmp
+   FFLAGS += -qopenmp
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
diff --git a/configuration/scripts/tests/test_restart.script b/configuration/scripts/tests/test_restart.script
index 0a43dd6c8..d65f3997b 100644
--- a/configuration/scripts/tests/test_restart.script
+++ b/configuration/scripts/tests/test_restart.script
@@ -7,8 +7,15 @@ cp ice_in ice_in.0
 ${ICE_CASEDIR}/casescripts/parse_namelist.sh ice_in ${ICE_CASEDIR}/casescripts/test_nml.restart1
 cp ice_in ice_in.1
 
+mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
+cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} run" >! ${ICE_CASEDIR}/test_output
+echo "RUN  ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output
+echo "PEND ${ICE_TESTNAME} exact-restart" >> ${ICE_CASEDIR}/test_output
+
 ./cice.run
 
+mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
+cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} run" >! ${ICE_CASEDIR}/test_output
 if ( $? != 0 ) then
   echo "FAIL ${ICE_TESTNAME} run-initial" >> ${ICE_CASEDIR}/test_output
   exit 99
@@ -42,6 +49,9 @@ endif
 
 #-----------------------------------------------------------
 
+mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
+cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} exact-restart" >! ${ICE_CASEDIR}/test_output
+
 echo "Exact Restart Comparison Mode:"
 echo "Performing binary comparison between files:"
 echo "base: $base_data"
diff --git a/configuration/scripts/tests/test_smoke.script b/configuration/scripts/tests/test_smoke.script
index 61731ff14..3d7565c13 100644
--- a/configuration/scripts/tests/test_smoke.script
+++ b/configuration/scripts/tests/test_smoke.script
@@ -3,8 +3,14 @@
 # Run the CICE model
 # cice.run returns -1 if run did not complete successfully
 
+mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
+cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} run" >! ${ICE_CASEDIR}/test_output
+echo "RUN  ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output
+
 ./cice.run
 
+mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
+cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} run" >! ${ICE_CASEDIR}/test_output
 if ( $? != 0 ) then
   # Run failed
   echo "FAIL ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output