From 70b41a186d538b14a1f1206c295b86505bc881aa Mon Sep 17 00:00:00 2001 From: Joseph Snyder Date: Tue, 4 Aug 2026 10:22:02 -0400 Subject: [PATCH 1/2] Adjust XML schema for instrumentation changes Following the updates to CMake in https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11251 and https://gitlab.kitware.com/cmake/cmake/-/merge_requests/12117 update the schema for the Build.xml files to allow the new `cmakeContent` attribute and remove the required flag for the `version` attribute --- app/Validators/Schemas/Build.xsd | 18 ++- app/Validators/Schemas/Configure.xsd | 6 +- tests/Feature/SubmissionValidation.php | 4 + .../valid_instrumentation_Build.xml | 113 ++++++++++++++++++ 4 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 tests/data/XmlValidation/valid_instrumentation_Build.xml diff --git a/app/Validators/Schemas/Build.xsd b/app/Validators/Schemas/Build.xsd index 1c5dad4dcc..21741961c1 100644 --- a/app/Validators/Schemas/Build.xsd +++ b/app/Validators/Schemas/Build.xsd @@ -123,6 +123,7 @@ + @@ -131,7 +132,7 @@ - + @@ -142,6 +143,7 @@ + @@ -149,7 +151,7 @@ - + @@ -173,12 +175,13 @@ + - + @@ -186,12 +189,13 @@ + - + @@ -202,12 +206,13 @@ + - + @@ -215,12 +220,13 @@ + - + diff --git a/app/Validators/Schemas/Configure.xsd b/app/Validators/Schemas/Configure.xsd index 64a0b61df6..44da246e3c 100644 --- a/app/Validators/Schemas/Configure.xsd +++ b/app/Validators/Schemas/Configure.xsd @@ -35,12 +35,13 @@ + - + @@ -48,12 +49,13 @@ + - + diff --git a/tests/Feature/SubmissionValidation.php b/tests/Feature/SubmissionValidation.php index 3b781a8f16..c6d41e2ed4 100644 --- a/tests/Feature/SubmissionValidation.php +++ b/tests/Feature/SubmissionValidation.php @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tests/data/XmlValidation/valid_instrumentation_Build.xml b/tests/data/XmlValidation/valid_instrumentation_Build.xml new file mode 100644 index 0000000000..2f5640caa2 --- /dev/null +++ b/tests/data/XmlValidation/valid_instrumentation_Build.xml @@ -0,0 +1,113 @@ + + + + Aug 04 09:20 EDT + 1785849630 + ../cdash-examples/shared-src + ../cdash-examples/5-instrumentation/bin + cmake --build . --config "Release" + + + + error + C++ + error.cxx + CMakeFiles/error.dir/error.cxx.o + object file + + + + ./cdash-examples/5-instrumentation/bin + /usr/bin/c++ + --coverage + -g + -MD + -MT + CMakeFiles/error.dir/error.cxx.o + -MF + CMakeFiles/error.dir/error.cxx.o.d + -o + CMakeFiles/error.dir/error.cxx.o + -c + ../cdash-examples/shared-src/error.cxx + + + + + ../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(); + | ^~~~ + 1 + + + + + + + + 1.5283203125 + + + + + + + + 1.5283203125 + + + + + + + + + + + + 1.5283203125 + + + + + + + + + + + + 1.5283203125 + + + + + + + + 1.5283203125 + + + + + + + + + + + + 1.5283203125 + + + + + Aug 04 09:20 EDT + 1785849632 + 0 + + From fa1dc9d79bb0abf968c088bece38c46a1c29efa6 Mon Sep 17 00:00:00 2001 From: Joseph Snyder Date: Tue, 4 Aug 2026 13:45:06 -0400 Subject: [PATCH 2/2] Update app/Validators/Schemas/Configure.xsd Co-authored-by: William Allen <16820599+williamjallen@users.noreply.github.com> --- app/Validators/Schemas/Configure.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Validators/Schemas/Configure.xsd b/app/Validators/Schemas/Configure.xsd index 44da246e3c..0376add078 100644 --- a/app/Validators/Schemas/Configure.xsd +++ b/app/Validators/Schemas/Configure.xsd @@ -55,7 +55,7 @@ - +