From 2a1b4a03a9b5c2e8169a75204b163ec982c71d25 Mon Sep 17 00:00:00 2001
From: Chris Fischer <fischer@ucar.edu>
Date: Mon, 23 Oct 2017 15:46:08 -0600
Subject: [PATCH] Update testreporter to report failed PFS test to the
 database. Update testreporter to handle PEND status for builds. Removed AWAV
 was the testlist.

Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1924

User interface changes?:

Update gh-pages html (Y/N)?:

Code review:
---
 scripts/Tools/testreporter.py                 | 28 ++++++++++---------
 .../mct/cime_config/testdefs/testlist_drv.xml |  9 ------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/scripts/Tools/testreporter.py b/scripts/Tools/testreporter.py
index 41f73bf0372..5c33e478713 100755
--- a/scripts/Tools/testreporter.py
+++ b/scripts/Tools/testreporter.py
@@ -125,75 +125,77 @@ def get_testreporter_xml(testroot, testid, tagname, testtype):
                 test_status['BASELINE']=line[0:4]
             if "TPUTCOMP" in line:
                 test_status['TPUTCOMP']=line[0:4]
+                if "FAIL PFS" in line:
+                    test_status['STATUS']="FAIL"
             if "INIT" in line:
                 test_status['INIT']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="SFAIL"
                     test_status['COMMENT']+="INIT fail! "
                     break
             if "CREATE_NEWCASE" in line:
                 test_status['CREATE_NEWCASE']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="SFAIL"
                     test_status['COMMENT']+="CREATE_NEWCASE fail! "
                     break
             if "XML" in line:
                 test_status['XML']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="SFAIL"
                     test_status['COMMENT']+="XML fail! "
                     break
             if "SETUP" in line:
                 test_status['SETUP']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="SFAIL"
                     test_status['COMMENT']+="SETUP fail! "
                     break
             if "SHAREDLIB_BUILD" in line:
                 test_status['SHAREDLIB_BUILD']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="CFAIL"
                     test_status['COMMENT']+="SHAREDLIB_BUILD fail! "
                     break
             if "MODEL_BUILD" in line:
                 test_status['MODEL_BUILD']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['STATUS']="CFAIL"
                     test_status['COMMENT']+="MODEL_BUILD fail! "
                     break
             if "SUBMIT" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="SUBMIT fail! "
                     break
             if "RUN" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="RUN fail! "
                     break
             if "COMPARE_base_rest" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="Restart fail! "
                     break
             if "COMPARE_base_hybrid" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="Hybrid fail! "
                     break
             if "COMPARE_base_multiinst" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="Multi instance fail! "
                     break
             if "COMPARE_base_test" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="Base test fail! "
                     break
             if "COMPARE_base_single_thread" in line:
                 test_status['STATUS']=line[0:4]
-                if line[0:4] == "FAIL":
+                if line[0:4] in ("FAIL","PEND"):
                     test_status['COMMENT']+="Thread test fail! "
                     break
 
diff --git a/src/drivers/mct/cime_config/testdefs/testlist_drv.xml b/src/drivers/mct/cime_config/testdefs/testlist_drv.xml
index 7cd1cb792ab..12309561e46 100644
--- a/src/drivers/mct/cime_config/testdefs/testlist_drv.xml
+++ b/src/drivers/mct/cime_config/testdefs/testlist_drv.xml
@@ -614,15 +614,6 @@
       </machine>
     </machines>
   </test>
-  <test name="SMS_Ld3" grid="ww3a_ww3a" compset="AWAV">
-    <machines>
-      <machine name="hobart" compiler="pgi" category="prebeta">
-        <options>
-          <option name="wallclock">00:30:00</option>
-        </options>
-      </machine>
-    </machines>
-  </test>
   <test name="PRE" grid="f09_f09" compset="ADESP">
     <machines>
       <machine name="hobart" compiler="nag" category="pauseresume"/>