Skip to content
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.

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

Some XSpec for testing CI/CD #9

Merged
merged 26 commits into from
Apr 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f20161f
Mods to markdown XSLT; demo XSpec providing a pattern
wendellpiez Jan 2, 2024
78ec245
Making tests slightly more transparent / refining approaches
wendellpiez Jan 2, 2024
3146214
Pushing the capability boundary by including some iXML (not yet suppo…
wendellpiez Jan 18, 2024
540ae10
Excluding the bad XSpec from Maven 'run-xspec/test' XSpec run, pendin…
wendellpiez Jan 19, 2024
7aaee89
Readme improvements
wendellpiez Jan 19, 2024
cca704b
Corrected glitch in ixml demo
wendellpiez Jan 22, 2024
252a534
Adding XSpec-dev pipeline and scripting support for XSpec
wendellpiez Mar 27, 2024
3a3fc7c
Added scripting and 'make' infrastructure; XProc3 folder w/ Morgana a…
wendellpiez Mar 27, 2024
c870dd6
Adding the submodule directory now
wendellpiez Mar 27, 2024
8c41469
Updated readme.md
wendellpiez Mar 27, 2024
948f57e
Restoring 'target' exclusion to XSpec (we need it)
wendellpiez Mar 27, 2024
1cdeabe
Trying adjusted pom.xml
wendellpiez Mar 27, 2024
e82d800
Placating a jealous (and zealous) robot
wendellpiez Mar 27, 2024
eb11252
More integration/testing and cleanup
wendellpiez Mar 27, 2024
4cedf9b
demo Makefile in random-util showing an XSpec runtime
wendellpiez Mar 27, 2024
0a50d8d
Adjustment to draft CI/CD logic (not yet in place)
wendellpiez Apr 2, 2024
f17abc2
Pegging XSpec submodule to 9cdf371 - v2.3.2
wendellpiez Apr 2, 2024
ca78883
Moving submodule, with updated paths
wendellpiez Apr 2, 2024
d82180d
Some Makefile demonstration
wendellpiez Apr 2, 2024
cb21ea4
Mostly editorial corrections and cleanup
wendellpiez Apr 2, 2024
3120554
Some restoration work on scripts in directory-manifest, with demo run…
wendellpiez Apr 3, 2024
80fd48a
Adding exclusion rule for CI/CD testing
wendellpiez Apr 4, 2024
3b0ee9d
New Makefile logic bypasses bash scripting for resource management (w…
wendellpiez Apr 4, 2024
5175b3b
oops, deleted the wrong stuff there!
wendellpiez Apr 4, 2024
8257a47
Tightening testing and TESTING.md, with better demos
wendellpiez Apr 5, 2024
2ab78c7
Further editorial adjustments
wendellpiez Apr 5, 2024
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
15 changes: 6 additions & 9 deletions random-util/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ spec-test: xspec-tests ## Run specification tests (currently xspec-tests)


.PHONY: xspec-tests
xspec-tests: ## Run XSpecs found in 'tests' folder
xspec-tests: ## Run XSpecs found in tests folder
mkdir -p $(output_folder)
LOGFILE="$(output_folder)/xspec-tests.log" $(xspec_script) \
"baseURI=file:$(module_path)/" \
"folder=tests" \
"report-to=$(output_folder)" \
"stop-on-error=no" \
"recurse=yes" \
"theme=toybox"

mvn --quiet \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like this change. I was able to run the tests via this makefile from a "Git Bash for Windows" window, without having Linux or WSL installed. Before this change, that didn't work for me.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, I am really curious as to how this change made it work. I guess I have to test on Windows.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually not the change shown, but this change: 5175b3b

-f "../common/pom.xml" \
exec:java \
-Dexec.mainClass="net.sf.saxon.Transform" \
-Dexec.args="-it:go -xsl:\"../xspec-dev/XSPEC-BATCH.xsl\" -init:org.nineml.coffeesacks.RegisterCoffeeSacks folder=random-util/tests"

.PHONY: clean
clean: ## Remove test output
Expand Down