Skip to content

Commit

Permalink
Merge pull request #1509 from jedwards4b/allowed_schema_skip
Browse files Browse the repository at this point in the history
Fix env_mach_specific validation

Allow the user the option of skipping the xmllint validation of cime xml files.

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

Addresses #1505

User interface changes?: Adds --skip-xml-validation flag to all user interface scripts

Code review:
  • Loading branch information
jgfouca authored May 10, 2017
2 parents 81161d6 + 99b0c6a commit 144cc38
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions config/xml_schemas/env_mach_specific.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<xs:sequence>
<xs:element ref="header"/>
<xs:element ref="module_system"/>
<xs:element maxOccurs="unbounded" ref="environment_variables"/>
<xs:element maxOccurs="unbounded" ref="mpirun"/>
<xs:element maxOccurs="unbounded" ref="entry"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="environment_variables"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="mpirun"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="entry"/>
</xs:sequence>
<xs:attribute ref="id" use="required"/>
<xs:attribute ref="version" use="required"/>
Expand All @@ -35,9 +35,9 @@
<xs:element name="module_system">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="init_path"/>
<xs:element maxOccurs="unbounded" ref="cmd_path"/>
<xs:element maxOccurs="unbounded" ref="modules"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="init_path"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cmd_path"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="modules"/>
</xs:sequence>
<xs:attribute name="type" use="required" type="xs:NCName"/>
</xs:complexType>
Expand Down

0 comments on commit 144cc38

Please sign in to comment.