Updates to accommodate CI/CD #1985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Imitate changes in xslt3-functions PR#7. - CI/CD puts compiled XSpec file somewhere else, so define ov:service variable more robustly so that uuid-value.txt will be found regardless of where compiled XSpec file is. - Java UUID class is not found in CI/CD, so conditionalize tests that use it. Running XSpec in Oxygen finds the class and verifies its results (same as before this change).
|
@galtm - The path to the "missing file" was addressed by your change. There are other tests failing. Majority, due to another relative path not well defined (details below, based on local execution): Here is first error: The other tests appear to fail due to the relative path I mentioned: Everywhere where the path is define as: It should be: since the project tree is: OSCAL/src/specifications/profile-resolution/proile-resolution-examples/catalogs/xyz-tiny_catalog.xml |
- 2nd argument of resolve-uri makes the path relative to the original XSpec file instead of the compiled one, whose location can vary depending on how the test is run - Remove one ../ from URI to resolve (similar to usnistgov#1945) because of directory reorg
Temporary change until it's clear whether this feature is supported and what its expected result should be.
`select="id('a1-stmt')"` works in Oxygen but not xspec.bat or CI/CD. Expressing that select attribute a different way.
Also, I fixed a select attribute where the namespace prefix
was missing. The omission caused the test to pass for the wrong
reason (empty context).
|
@iMichaela , thanks for running the makefile on Linux and sharing the results. I pushed a few new commits:
For all the tests that showed failures in the output you cited earlier, I ran the modified tests in Oxygen and in a Windows shell using Cc: @wendellpiez |
galtm
commented
Feb 23, 2024
|
Indeed. All tests passed. I will review one more time today and approve it. |
wendellpiez
approved these changes
Feb 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Committer Notes
{Please provide a brief description of what this PR accomplishes. Be sure to reference any issues addressed. If the PR is a work-in-progress submitted for early review, please include [WIP] at the beginning of the title or mark the PR as DRAFT.}
This PR imitates changes in xslt3-functions PR#7 to make XSpec tests compatible with CI/CD.
CI/CD puts compiled XSpec file somewhere else, so define ov:service variable more robustly so that uuid-value.txt will be found regardless of where compiled XSpec file is.
Java UUID class is not found in CI/CD, so conditionalize tests that use it. Running XSpec in Oxygen finds the class and verifies its results (same as before this change).
All Submissions:
By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.
(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)
Changes to Core Features:
N/A because this is not a feature change.