Update test deps (as of 2019-01-22Z) #504
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
…ormat-xslt # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…erialize # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…359-367 # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…-flags # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…diff # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…ort-value # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…355-357-358-360-361 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…sequence # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…-151 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec
# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…nt-family # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…ments-in-xslt # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…rom-del-cmd # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…ic-env-vars # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats
…-423_xquery # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-308.xspec # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats
…-423_xproc # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-308.xspec # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats
…308_xquery # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-308.xspec # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats
…selection_xquery # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats
…-59-2_xquery # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-variable.xspec # test/xspec.bats
…est_doc_multi-nodes # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-variable.xspec # test/xspec.bats
…query-expect # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-variable.xspec # test/xspec.bats
…query-param # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-variable.xspec # test/xspec.bats
…e-node-generator # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-variable.xspec # test/xspec.bats
…deep-equal-elements # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-59_use-case-1.xspec # test/xspec-variable.xspec # test/xspec.bats
…e-type # Conflicts: # test/xspec-result-naming-collision.xspec
…ambiguous-expect_xquery # Conflicts: # test/win-bats/collection.xml # test/xspec.bats
|
@cirulls |
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.
This pull request derives from #503. So needs to be handled after that.
This pull request updates the versions of Saxon and XML Calabash used for testing.
Saxon 9.9.1.1 outputs more diagnostic lines, so cd5a2ca updates some expected line numbers.