Skip to content

Commit

Permalink
Merge pull request #1604 from jedwards4b/refcase_fix
Browse files Browse the repository at this point in the history 
Fixed issue with GET_REFCASE not being set correctly that was introduced with PR#1561 and
an issue with X compset mapping files that was introduced in #1586

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

Fixes

User interface changes?:

Code review:
  • Loading branch information
@fischer-ncar
fischer-ncar authored May 24, 2017
2 parents 56fd28c + 1089189 commit 25a7f27
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion scripts/lib/CIME/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,8 @@ def configure(self, compset_name, grid_name, machine_name=None,

self.get_compset_var_settings()

self.clean_up_lookups()

#--------------------------------------------
# machine
#--------------------------------------------
Expand Down Expand Up @@ -889,7 +891,6 @@ def configure(self, compset_name, grid_name, machine_name=None,
if test:
self.set_value("TEST",True)

self.clean_up_lookups()
self.initialize_derived_attributes()

# Make sure that parallel IO is not specified if total_tasks==1
Expand Down
8 changes: 4 additions & 4 deletions scripts/lib/update_acme_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
"TESTRUNFAILEXC_P1.f19_g16_rx1.A",
"TESTRUNPASS_P1.f19_g16_rx1.A",
"TESTTESTDIFF_P1.f19_g16_rx1.A",
"TESTMEMLEAKFAIL_P1.f19_g16.X",
"TESTMEMLEAKPASS_P1.f19_g16.X")
"TESTMEMLEAKFAIL_P1.f09_g16.X",
"TESTMEMLEAKPASS_P1.f09_g16.X")
),

"cime_developer" : (None, "0:10:00",
("NCK_Ld3.f45_g37_rx1.A",
"ERI.f45_g37.X",
"ERIO.f45_g37.X",
"ERI.f09_g16.X",
"ERIO.f09_g16.X",
"SEQ_Ln9.f19_g16_rx1.A",
"ERS.ne30_g16_rx1.A",
"ERS_N2.f19_g16_rx1.A",
Expand Down
12 changes: 6 additions & 6 deletions scripts/tests/scripts_regression_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,8 @@ def test_a_phases(self):
###########################################################################
# exclude the MEMLEAK tests here.
tests = update_acme_tests.get_full_test_names(["cime_test_only",
"^TESTMEMLEAKFAIL_P1.f19_g16.X",
"^TESTMEMLEAKPASS_P1.f19_g16.X",
"^TESTMEMLEAKFAIL_P1.f09_g16.X",
"^TESTMEMLEAKPASS_P1.f09_g16.X",
"^TESTTESTDIFF_P1.f19_g16_rx1.A",
"^TESTBUILDFAILEXC_P1.f19_g16_rx1.A",
"^TESTRUNFAILEXC_P1.f19_g16_rx1.A"],
Expand Down Expand Up @@ -1027,14 +1027,14 @@ class T_TestRunRestart(TestCreateTestCommon):
###########################################################################
def test_run_restart(self):
###########################################################################
run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f45_g37.X"
run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f09_g16.X"
% (SCRIPT_DIR, TEST_ROOT, TEST_ROOT, self._baseline_name))
if self._hasbatch:
run_cmd_assert_result(self, "%s/wait_for_tests *%s/TestStatus" % (TOOLS_DIR, self._baseline_name),
from_dir=self._testroot)

casedir = os.path.join(self._testroot,
"%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f45_g37.X", machine=self._machine, compiler=self._compiler), self._baseline_name))
"%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f09_g16.X", machine=self._machine, compiler=self._compiler), self._baseline_name))

fail_sentinel = os.path.join(casedir, "run", "FAIL_SENTINEL")
self.assertTrue(os.path.exists(fail_sentinel), msg="Missing %s" % fail_sentinel)
Expand All @@ -1045,15 +1045,15 @@ def test_run_restart(self):
def test_run_restart_too_many_fails(self):
###########################################################################
os.environ["NODEFAIL_NUM_FAILS"] = "5"
run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f45_g37.X"
run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f09_g16.X"
% (SCRIPT_DIR, TEST_ROOT, TEST_ROOT, self._baseline_name),
expected_stat=(0 if self._hasbatch else CIME.utils.TESTS_FAILED_ERR_CODE))
if self._hasbatch:
run_cmd_assert_result(self, "%s/wait_for_tests *%s/TestStatus" % (TOOLS_DIR, self._baseline_name),
from_dir=self._testroot, expected_stat=CIME.utils.TESTS_FAILED_ERR_CODE)

casedir = os.path.join(self._testroot,
"%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f45_g37.X", machine=self._machine, compiler=self._compiler), self._baseline_name))
"%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f09_g16.X", machine=self._machine, compiler=self._compiler), self._baseline_name))

fail_sentinel = os.path.join(casedir, "run", "FAIL_SENTINEL")
self.assertTrue(os.path.exists(fail_sentinel), msg="Missing %s" % fail_sentinel)
Expand Down

0 comments on commit 25a7f27

Please sign in to comment.