-
Notifications
You must be signed in to change notification settings - Fork 31
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
Restore test file format #318
Conversation
…c-rule # Conflicts: # build.xml # test/saxon-custom-options/config.xml # test/saxon-custom-options/test.xspec # test/xspec-bat.cmd # test/xspec.bats
…st-file-format # Conflicts: # build.xml # test/saxon-custom-options/config.xml # test/saxon-custom-options/test.xspec # test/xspec-bat.cmd # test/xspec.bats
…k/xspec into valid-xspec-rule # Conflicts: # test/xspec-bat.cmd # test/xspec.bats
…c-rule # 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
…st-file-format # 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
…c-rule # Conflicts: # test/xspec-bat.cmd # test/xspec.bats
…st-file-format # Conflicts: # test/xspec-bat.cmd # test/xspec.bats
…c-rule # Conflicts: # test/xspec-bat.cmd # test/xspec.bats
…into restore-test-file-format # Conflicts: # test/xspec.bats
…st-file-format # Conflicts: # .travis.yml # appveyor.yml # test/run-bats.cmd # test/run-bats.sh # test/win-bats/collection.xml # test/xspec.bats
…st-file-format # Conflicts: # test/end-to-end/cases/xspec-rule.xspec
…st-file-format # Conflicts: # test/generate-tests-utils.xspec # test/generate-x-utils.xspec
@AirQuick: I tried to trace the failed build in AppVeyor or to trigger manually the webhook in GitHub but without success. I wonder if you could push a dummy commit to the branch of this pull request to re-trigger the test build on AppVeyor, this should turn the checks into green. Since we are always doing squash and merge into master the dummy commit should not add junk in your branch. If you have a better idea to turn the AppVeyor check into green, feel free to share it. |
This reverts commit 7ee46fa.
Thanks @cirulls , your idea has made this pr green again. |
@cirulls @galtm |
I should have some time today and/or over the weekend to catch up on your recent comments. |
@AirQuick: thanks, I added this to the release notes. I think I am party responsible of weird formatting on some files. Just out of interest and for future commits: do you use the automatic format and indent in oXygen to format files before committing them? Or do you have any rules for formatting files (e.g. tabs, number of spaces, etc.)? |
Formatting wasn't weird and I think it's fine to change it occasionally (inserting some spaces, wrapping too long grew lines). I usually use the automatic formatting on oXygen and do so when I make initial commits (because this repository hasn't established any rule yet) or modify a file which was first created by me (because I know its initial automatic formatting rule) or refactor a file broadly (because the changes are disruptive anyway). At some point in future we may want to
|
This sounds like a good plan although it may take some time to implement it and enforce it via the CI systems. I created #515 to record this conversation in an issue. |
This pull request derives from #317. So needs to be handled after that.
.xspec
files in the repository have experienced unrelated format modifications in these few years.So it's hard to see what the actual changes are.
This pull request restores the original format of these files:
test/generate-tests-utils.xspec
test/generate-x-utils.xspec
test/generate-xspec-tests.xspec
test/unit-expect-xsl.xspec
test/xspec-focus-2.xspec
test/xspec-rule.xspec
test/xspec-variable.xspec
test/end-to-end/cases/xspec-focus-1.xspec
test/end-to-end/cases/xspec-function.xspec
test/end-to-end/cases/xspec-import.xspec
test/end-to-end/cases/xspec-imported.xspec
test/end-to-end/cases/xspec-pending.xspec
tutorial/escape-for-regex.xspec
Now you can clearly see what has actually changed in those files.