Skip to content

Adjust XML schema for instrumentation changes #3919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
williamjallen merged 2 commits into from
Aug 4, 2026
+133 −8
Merged

Adjust XML schema for instrumentation changes #3919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b41a1
Adjust XML schema for instrumentation changes
josephsnyder Aug 4, 2026
fa1dc9d
Update app/Validators/Schemas/Configure.xsd
josephsnyder Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions app/Validators/Schemas/Build.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<xs:element maxOccurs="unbounded" ref="Outputs"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="config" use="required"/>
Expand All @@ -131,7 +132,7 @@
<xs:attribute name="result" use="required"/>
<xs:attribute name="source" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="Link">
Expand All @@ -142,14 +143,15 @@
<xs:element maxOccurs="unbounded" ref="Outputs"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="config" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="language" use="required"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
</xs:choice>
Expand All @@ -173,25 +175,27 @@
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="NamedMeasurement"/>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="CmakeInstall">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="NamedMeasurement"/>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="Custom">
Expand All @@ -202,25 +206,27 @@
<xs:element maxOccurs="unbounded" ref="Outputs"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="Install">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="NamedMeasurement"/>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
</xs:choice>
Expand Down
6 changes: 4 additions & 2 deletions app/Validators/Schemas/Configure.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,27 @@
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="NamedMeasurement"/>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
<xs:element name="Configure">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="NamedMeasurement"/>
</xs:sequence>
<xs:attribute name="cmakeContent" use="optional"/>
<xs:attribute name="command" use="required"/>
<xs:attribute name="workingDir" use="required"/>
<xs:attribute name="duration" use="required" type="xs:integer"/>
<xs:attribute name="result" use="required"/>
<xs:attribute name="timeStart" use="required" type="xs:integer"/>
<xs:attribute name="version" use="required" type="xs:integer"/>
<xs:attribute name="version" use="optional" type="xs:integer"/>
</xs:complexType>
</xs:element>
</xs:choice>
Expand Down
4 changes: 4 additions & 0 deletions tests/Feature/SubmissionValidation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public function testSubmissionValidationNoEnv(): void
$this::assertTrue($this->submit('valid_Configure1.xml'), 'Submission of valid_Configure1.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Configure2.xml'), 'Submission of valid_Configure2.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Build.xml'), 'Submission of valid_Build.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_instrumentation_Build.xml'), 'Submission of valid_instrumentation_Build.xml was not successful when it should have passed.');
}

/** Check that error messages are logged but submission succeeds
Expand All @@ -64,6 +65,7 @@ public function testSubmissionValidationSilent(): void
$this::assertTrue($this->submit('valid_Configure1.xml'), 'Submission of valid_Configure1.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Configure2.xml'), 'Submission of valid_Configure2.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Build.xml'), 'Submission of valid_Build.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_instrumentation_Build.xml'), 'Submission of valid_instrumentation_Build.xml was not successful when it should have passed.');
}

/** Check that error messages are logged but submission succeeds
Expand All @@ -77,6 +79,7 @@ public function testSubmissionValidationWarn(): void
$this::assertTrue($this->submit('valid_Configure1.xml'), 'Submission of valid_Configure1.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Configure2.xml'), 'Submission of valid_Configure2.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Build.xml'), 'Submission of valid_Build.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_instrumentation_Build.xml'), 'Submission of valid_instrumentation_Build.xml was not successful when it should have passed.');
}

/** Check that the submission is dependent upon passing validation
Expand All @@ -90,6 +93,7 @@ public function testSubmissionValidationReject(): void
$this::assertTrue($this->submit('valid_Configure1.xml'), 'Submission of valid_Configure1.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Configure2.xml'), 'Submission of valid_Configure2.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_Build.xml'), 'Submission of valid_Build.xml was not successful when it should have passed.');
$this::assertTrue($this->submit('valid_instrumentation_Build.xml'), 'Submission of valid_instrumentation_Build.xml was not successful when it should have passed.');
}

public function tearDown(): void
Expand Down
113 changes: 113 additions & 0 deletions tests/data/XmlValidation/valid_instrumentation_Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<Site BuildName="dummy_build_name"
BuildStamp="dummy_stamp"
Name="dummy_name"
>
<Build>
<StartDateTime>Aug 04 09:20 EDT</StartDateTime>
<StartBuildTime>1785849630</StartBuildTime>
<SourceDirectory>../cdash-examples/shared-src</SourceDirectory>
<BinaryDirectory>../cdash-examples/5-instrumentation/bin</BinaryDirectory>
<BuildCommand>cmake --build . --config "Release"</BuildCommand>
<Failure type="Error">
<!-- Meta-information about the build action -->
<Action>
<TargetName>error</TargetName>
<Language>C++</Language>
<SourceFile>error.cxx</SourceFile>
<OutputFile>CMakeFiles/error.dir/error.cxx.o</OutputFile>
<OutputType>object file</OutputType>
</Action>
<!-- Details of command -->
<Command>
<WorkingDirectory>./cdash-examples/5-instrumentation/bin</WorkingDirectory>
<Argument>/usr/bin/c++</Argument>
<Argument>--coverage</Argument>
<Argument>-g</Argument>
<Argument>-MD</Argument>
<Argument>-MT</Argument>
<Argument>CMakeFiles/error.dir/error.cxx.o</Argument>
<Argument>-MF</Argument>
<Argument>CMakeFiles/error.dir/error.cxx.o.d</Argument>
<Argument>-o</Argument>
<Argument>CMakeFiles/error.dir/error.cxx.o</Argument>
<Argument>-c</Argument>
<Argument>../cdash-examples/shared-src/error.cxx</Argument>
</Command>
<!-- Result of command -->
<Result>
<StdOut/>
<StdErr>../cdash-examples/shared-src/error.cxx: In function ‘int main(int, char**)’:
../cdash-examples/shared-src/error.cxx:3:3: error: ‘asdf’ was not declared in this scope
3 | asdf();
| ^~~~</StdErr>
<ExitCondition>1</ExitCondition>
</Result>
</Failure>
<Targets>
<Target name="fails" type="EXECUTABLE">
<Commands>
<Compile cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/usr/bin/c++ (truncated)" config="Debug" duration="446" language="C++" result="0" source="/home/softhat/Work/LANL/cdash-examples/shared-src/fails.cxx" timeStart="1785849631748" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
<Outputs>
<Output name="CMakeFiles/fails.dir/fails.cxx.o" size="31464"/>
</Outputs>
</Compile>
<Link cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/usr/bin/c++ (truncated)" config="Debug" duration="128" language="C++" result="0" timeStart="1785849632222" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
<Outputs>
<Output name="fails" size="43104"/>
</Outputs>
</Link>
</Commands>
</Target>
<Target name="error" type="EXECUTABLE">
<Commands>
<Compile cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/usr/bin/c++ (truncated)" config="Debug" duration="25" language="C++" result="1" source="/home/softhat/Work/LANL/cdash-examples/shared-src/error.cxx" timeStart="1785849632402" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
<Outputs>
<Output name="CMakeFiles/error.dir/error.cxx.o" size="0"/>
</Outputs>
</Compile>
</Commands>
</Target>
<Target name="passes" type="EXECUTABLE">
<Commands>
<Link cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/usr/bin/c++ (truncated)" config="Debug" duration="186" language="C++" result="0" timeStart="1785849631503" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
<Outputs>
<Output name="passes" size="43056"/>
</Outputs>
</Link>
<Compile cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/usr/bin/c++ (truncated)" config="Debug" duration="513" language="C++" result="0" source="/home/softhat/Work/LANL/cdash-examples/shared-src/passes.cxx" timeStart="1785849630954" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
<Outputs>
<Output name="CMakeFiles/passes.dir/passes.cxx.o" size="31024"/>
</Outputs>
</Compile>
</Commands>
</Target>
</Targets>
<Commands>
<CmakeBuild cmakeContent="content/cmake-2026-08-04T13-20-30-0838.json" command="/home/softhat/Work/cmake-build/bin/cmake (truncated)" duration="1566" result="2" timeStart="1785849630867" workingDir="/home/softhat/Work/LANL/cdash-examples/5-instrumentation/bin">
<NamedMeasurement type="numeric/double" name="AfterCPULoadAverage">
<Value>1.5283203125</Value>
</NamedMeasurement>
</CmakeBuild>
</Commands>
<Log Encoding="base64" Compression="bin/gzip"/>
<EndDateTime>Aug 04 09:20 EDT</EndDateTime>
<EndBuildTime>1785849632</EndBuildTime>
<ElapsedMinutes>0</ElapsedMinutes>
</Build>
</Site>