fix for lii test and response to review

E3SM-Project · Jul 26, 2016 · a796384 · a796384
1 parent 1894e28
commit a796384
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/scripts/create_test b/scripts/create_test
@@ -161,7 +161,7 @@ OR
                         help="Use this category key in the lookup in testlist.xml")
     parser.add_argument("--xml-testlist",
                         help="Use this testlist to lookup tests")
-    parser.add_argument("--testfile", nargs=1, default=None,
+    parser.add_argument("--testfile",
                         help="A file containing an ascii list of tests to run")
 
     args = parser.parse_args(args[1:])

diff --git a/utils/python/CIME/SystemTests/lii.py b/utils/python/CIME/SystemTests/lii.py
@@ -60,8 +60,8 @@ def run(self):
         self._case.set_value("HIST_OPTION","$STOP_OPTION")
         self._case.set_value("HIST_N","$STOP_N")
         self._case.flush()
-        for user_nl_dir in ("user_nl_nointerp", "user_nl_interp"):
-            for filename in glob.glob(r'%s/*'%user_nl_dir):
+        for user_nl_dir in ("nointerp", "interp"):
+            for filename in glob.glob(r'user_nl_%s/*'%user_nl_dir):
                 shutil.copy(filename,
                             os.path.join(caseroot,os.path.basename(filename)))
 
@@ -70,11 +70,11 @@ def run(self):
             logger.info("doing a %d %s initial test with init_interp set to %s, no restarts written"
                         % (stop_n, stop_option, os.path.basename(filename) == "user_nl_interp"))
 
-            success = SystemTestsCommon._run(self)
+            success = SystemTestsCommon._run(self, suffix=user_nl_dir)
             if not success:
                 break
         if success:
-            return self._component_compare_test("base", "init_interp_on")
+            return self._component_compare_test("nointerp", "interp")
         else:
             return False
 

diff --git a/utils/python/CIME/SystemTests/system_tests_common.py b/utils/python/CIME/SystemTests/system_tests_common.py
@@ -280,7 +280,7 @@ def compare_baseline(self):
         if not os.path.isfile(baselog):
             # for backward compatibility
             baselog = os.path.join(basecmp_dir, "cpl.log")
-        if baselog is not None and len(memlist) > 3:
+        if os.path.isfile(baselog) and len(memlist) > 3:
             blmem = self._get_mem_usage(baselog)[-1][1]
             curmem = memlist[-1][1]
             diff = (curmem-blmem)/blmem