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

Fix xspec.bat to accommodate 11+ params #294

Merged
merged 132 commits into from
Dec 20, 2018

Conversation

AirQuick
Copy link
Member

This pull request derives from #293. So needs to be handled after that.


xspec.bat (the command line for Windows) drops the 11th+ arguments.

This pull request

  • adds test cases (25e1721) for the bug.
    You can see the test fails on AppVeyor before committing the fix.
  • fixes the bug (8d739c2).
    You can see it takes effect on AppVeyor.

As a bonus, we now have a test for -h.

…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…aramater

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…arams_cumulative

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	build.xml
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…-tests

# Conflicts:
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
…aramater

# Conflicts:
#	build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…arams_cumulative

# Conflicts:
#	build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…aramater

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…arams_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…k/xspec into align-bats-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…arams_cumulative

# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick AirQuick added this to the v1.2.0 milestone Dec 14, 2018
@cirulls cirulls self-requested a review December 17, 2018 22:41
@AirQuick
Copy link
Member Author

AirQuick commented Dec 20, 2018

I know this is a busy time of year. If no concern arises in 72 hours, I'd like to merge this anyway because it's low-risk and has tests. (Actually 300+ days have already passed without any concern since the change was first submitted.)

Copy link
Member

@cirulls cirulls left a comment

Choose a reason for hiding this comment

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

This looks good to me. I tested it as follows:

  • I replicated the bug on the current master branch, running the command in the test on Windows returns Error: file not found.
  • I executed the command in the test on Windows on the branch of this pull request, it returns the usage help.
  • I ran the test suite on both Windows and Linux and checked that the new test was picked up and executed.

I'm merging this into master (sorry for the wait).

@cirulls cirulls merged commit e9c05e8 into xspec:master Dec 20, 2018
@AirQuick AirQuick deleted the fix_many-params_cumulative branch December 21, 2018 01:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants