Merge pull request #5 from ekluzek/fixtestopts

Fix testlist so options are under <test> rather than <machines>.

Author: ekluzek

cime_config/testdefs/testlist_mosart.xml

@@ -5,61 +5,55 @@
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
       <machine name="cheyenne" compiler="gnu" category="mosart"></machine>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="aux_clm"></machine>
       <machine name="hobart" compiler="nag" category="mosart"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-        <option name="comment"  >Restart test without DEBUG on all machines/compilers</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+      <option name="comment"  >Restart test without DEBUG on all machines/compilers</option>
+    </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/iceOff">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+    </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+    </options>
   </test>
   <test name="SMS_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
       <machine name="cheyenne" compiler="gnu" category="mosart"></machine>
       <machine name="hobart" compiler="nag" category="mosart"></machine>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="aux_clm"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-        <option name="comment"  >Smoke test with DEBUG on all machines/compilers</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+      <option name="comment"  >Smoke test with DEBUG on all machines/compilers</option>
+    </options>
   </test>
   <test name="SMS_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/decompOpts">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-        <option name="comment"  >decompOpts are not bit for bit on PE layout change</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+      <option name="comment"  >decompOpts are not bit for bit on PE layout change</option>
+    </options>
   </test>
   <test name="ERP_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/qgrwlOpts">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>
-      <options>
-        <option name="wallclock">0:20</option>
-      </options>
     </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+    </options>
   </test>
 </testlist>

doc/ChangeLog

@@ -1,7 +1,18 @@
+===============================================================
+Tag name:  mosart1_0_30
+Originator(s): erik
+Date: Jan 24, 2018
+One-line Summary:  Fix testlist so options are under test not machines
+
+Fix testlist so options are under <test> rather than <machines>.
+Also remove aux_clm category (any of those tests should be in CLM's testlist).
+
+ M cime_config/testdefs/testlist_mosart.xml
+
 ===============================================================
 Tag name:  mosart1_0_29
 Originator(s): erik
-Date: Jan 17, 2017
+Date: Jan 17, 2018
 One-line Summary:  Update testlist to version 2 format, remove ys tests
 
  Add buildnmlc to .gitignore