fix erp test update ChangeLog

ChangeLog

@@ -1,5 +1,73 @@
 ======================================================================
 
+Originator: Jim Edwards
+Date: July 22, 2016
+Tag: cime5.0.2
+Answer Changes: None
+Tests:
+Dependencies:
+
+Brief Summary: further fixes as a result of cesm2_alpha01 testing
+
+User interface changes:
+
+Modified files: git diff --name-status
+	d518834 minor change for hobart only
+	605e942 Merge pull request #283 from ESMCI/mira_walltime_fix
+	5ef8068 Merge pull request #284 from mvertens/newtests
+	462810e replaced ww3 with stub wave in several tests that are known to fail
+	a8b9e7c need to return default walltime
+
+======================================================================
+
+======================================================================
+
+Originator: Jim Edwards
+Date: July 22, 2016
+Tag: cime5.0.1
+Answer Changes: None
+Tests: cesm prealpha, prebeta, aux_*
+Dependencies:
+
+Brief Summary: fixes as a result of cesm2_alpha01 testing
+
+User interface changes:
+
+Modified files: git diff --name-status
+49e3c29 (HEAD, tag: cime5.0.1) Minor fix
+	11d61ce Merge pull request #279 from ESMCI/jgfouca/cime_bisect
+	b15cf46 Upgrade cime_bisect
+	873856a Merge pull request #278 from jedwards4b/minor_fixes_for_cesm_port
+	b990f48 add code to cp testreporter script for cesm
+	6ad54e9 Merge pull request #277 from fischer-ncar/testreporter_fix
+	be6d1b3 both compare and generate baseline_action_codes are allowed
+	e76ddc1 Fix for testreporter on hobart.
+	49fb888 fix issue with _caseroot when cloning
+	6d29a93 Update testreporter to work with updated ESMCI CIME
+	b7ed88f Updating to current ESMCI cime master
+	dbf9a47 Merge pull request #276 from ESMCI/jayeshkrishna/get_mira_working_for_ac
+	me
+	b5a2ce0 Get Mira working with acme
+	7adda2e updates for cesm allactive tests and compsets
+======================================================================
+
+======================================================================
+
+Originator: Jim Edwards
+Date: July 20th 2016
+Tag: cime5.0.0
+Answer Changes: None
+Tests: scripts_regression_tests
+Dependencies:
+
+Brief Summary: Scripts reimplemented in python
+
+User interface changes: Lots of new options, options that are
+	no longer there.
+
+Modified files: too numerous to mention, please see the git log
+======================================================================
+
 Originator: mvertens
 Date: July 9, 2016
 Tag: cime4.5.23
@@ -34,16 +102,16 @@ D       driver_cpl/shr_esmf/esmfshr_util_mod.F90
 D       driver_cpl/shr_esmf/mct2esmf_mod.F90
 ======================================================================
 
-Originator: fischer-ncar 
-Date: July 7, 2016 
+Originator: fischer-ncar
+Date: July 7, 2016
 Tag: cime4.5.22
 Answer Changes: None
-Tests: 
+Tests:
 Dependencies:
 
 Brief Summary:  Fix broken compset names
 
-User interface changes: 
+User interface changes:
 
 Modified files: git diff --name-status
 
@@ -88,16 +156,16 @@ A       share/csm_share/shr/water_types.F90
 
 ======================================================================
 
-Originator: fischer-ncar, Brain Kauffman 
+Originator: fischer-ncar, Brain Kauffman
 Date: 6 July 2016
 Tag: cime4.5.20
 Answer Changes: None
-Tests: 
+Tests:
 Dependencies:
 
 Brief Summary: Updates to config_files.xml and config_grids.xml to support mpas-o
 
-User interface changes: 
+User interface changes:
 
 Modified files: git diff --name-status
 M       cime_config/cesm/config_files.xml
@@ -109,31 +177,31 @@ Originator: apcraig
 Date: 6 July 2016
 Tag: cime4.5.19
 Answer Changes: None
-Tests: 
+Tests:
 Dependencies:
 
-Brief Summary: Addition of ice to ocean coupling fields Fioi_bcphi, 
+Brief Summary: Addition of ice to ocean coupling fields Fioi_bcphi,
                Fioi_bcpho, Fioi_flxdst
 
-User interface changes: 
+User interface changes:
 
 Modified files: git diff --name-status
 M       driver_cpl/shr/seq_flds_mod.F90
 
 ======================================================================
 
-Originator: fischer-ncar, jtruesdal 
-Date: 6 July 2016 
+Originator: fischer-ncar, jtruesdal
+Date: 6 July 2016
 Tag: cime4.5.18
 Answer Changes: Answer changes for compset with WaveWatch turned on.
                 All others are bit-for-bit.
 Tests: Namelist test ran on yellowstone, WAV_GRID manually looked at.
 Dependencies:
 
-Brief Summary: Add support to run WaveWatch.  Allactive    
+Brief Summary: Add support to run WaveWatch.  Allactive
                compset not being tested were removed.
 
-User interface changes: 
+User interface changes:
 
 Modified files: git diff --name-status
 M       cime_config/cesm/allactive/config_compsets.xml
@@ -147,7 +215,7 @@ Originator: fischer-ncar
 Date: 21 June 2016
 Tag: cime4.5.17
 Answer Changes: None
-Tests: 
+Tests:
 Dependencies: None
 
 Brief Summary:
@@ -163,16 +231,16 @@ M       driver_cpl/cime_config/testdefs/testlist_drv.xml
 
 ======================================================================
 
-Originator: 
-Date: 
+Originator:
+Date:
 Tag: cimeX.Y.Z
 Answer Changes: [None, Round Off, Climate Changing]
-Tests: 
+Tests:
 Dependencies:
 
 Brief Summary:
 
-User interface changes: 
+User interface changes:
 
 Modified files: git diff --name-status
 

utils/python/CIME/SystemTests/erp.py

@@ -95,7 +95,7 @@ def build(self, sharedlib_only=False, model_only=False):
     def run(self):
         # run will have values 1,2
         for run in range(1,3):
-            
+
             expect(os.path.isfile(os.path.join("LockedFiles","env_mach_pes.ERP%d.xml"%run)),
                    "ERROR: LockedFiles/env_mach_pes.ERP%d.xml does not exist, run case.build"%run )
 
@@ -128,7 +128,7 @@ def run(self):
                 self._case.set_value("REST_OPTION", stop_option)
                 self._case.set_value("HIST_N", stop_n)
                 self._case.set_value("HIST_OPTION", stop_option)
-                self._case.set_value("CONTINUE_RUN", False) 
+                self._case.set_value("CONTINUE_RUN", False)
                 suffix = "base"
             else:
                 rest_n = stop_n/2 + 1
@@ -142,7 +142,11 @@ def run(self):
             if not success:
                 break
 
-        return success
+        if success:
+            return self._component_compare_test("base", "rest")
+        else:
+            return False
+
 
 
     def report(self):