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.

Sign up for GitHub

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

Jump to bottom

Align Travis configuration with AppVeyor in #86 #96

Merged
merged 3 commits into from Mar 7, 2017
Merged

Align Travis configuration with AppVeyor in #86 #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca8679
align Travis configuration with AppVeyor in #86
Mar 6, 2017
04f5150
check on XMLCALABASH_CP instead of XMLCALABASH_VERSION #96
Mar 7, 2017
04aee5a
Merge branch 'master' into feature/86
Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ env:
matrix:
# latest Saxon 9.7 version
- SAXON_VERSION=9.7.0-15
XMLCALABASH_VERSION=1.1.15-97
# latest Saxon 9.6 version
- SAXON_VERSION=9.6.0-10
# Saxon version used in oXygen
Expand All @@ -19,10 +20,13 @@ before_script:
- wget -O ${SAXON_CP} http://central.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}.jar
- chmod +x ${SAXON_CP}
# install XML Calabash
- export XMLCALABASH_VERSION=1.1.15-97
- wget -O /tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}.zip https://github.com/ndw/xmlcalabash1/releases/download/${XMLCALABASH_VERSION}/xmlcalabash-${XMLCALABASH_VERSION}.zip
- unzip /tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}.zip -d /tmp/xspec
- export XMLCALABASH_CP=/tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}/xmlcalabash-${XMLCALABASH_VERSION}.jar
- if [ -z ${XMLCALABASH_VERSION} ]; then
echo "XMLCalabash will not be installed as it uses a higher version of Saxon";
else
wget -O /tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}.zip https://github.com/ndw/xmlcalabash1/releases/download/${XMLCALABASH_VERSION}/xmlcalabash-${XMLCALABASH_VERSION}.zip;
unzip /tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}.zip -d /tmp/xspec;
export XMLCALABASH_CP=/tmp/xspec/xmlcalabash-${XMLCALABASH_VERSION}/xmlcalabash-${XMLCALABASH_VERSION}.jar;
fi

script:
- cd test
Expand Down
4 changes: 4 additions & 0 deletions test/xspec.bats
View file
Open in desktop
Expand Up @@ -193,6 +193,10 @@ teardown() {


@test "executing the Saxon XProc harness generates a report with UTF-8 encoding" {
if [ -z ${XMLCALABASH_VERSION} ]; then
Copy link
Member

Choose a reason for hiding this comment

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

With this line, to run xspec.bats thoroughly, you have to set both XMLCALABASH_VERSION and XMLCALABASH_CP.
Can you consider checking the existence of XMLCALABASH_CP instead of XMLCALABASH_VERSION? That makes it a little bit easier to run xspec.bats on local console without .travis.yml, which I do occasionally.

Copy link
Member Author

Choose a reason for hiding this comment

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

The check in xspec.bats is now based on XMLCALABASH_CP instead of XMLCALABASH_VERSION (which makes more sense because XMLCalabash is properly installed only once XMLCALABASH_CP is set).

Have you got any further changes?

skip "test for XProc skipped as XMLCalabash uses a higher version of Saxon";
fi

run java -Xmx1024m -cp ${XMLCALABASH_CP} com.xmlcalabash.drivers.Main -isource=xspec-72.xspec xspec-home=file://${TRAVIS_BUILD_DIR}/ -oresult=${TRAVIS_BUILD_DIR}/test/xspec/xspec-72-result.html ${TRAVIS_BUILD_DIR}/src/harnesses/saxon/saxon-xslt-harness.xproc
run java -cp ${SAXON_CP} net.sf.saxon.Query -s:${TRAVIS_BUILD_DIR}/test/xspec/xspec-72-result.html -qs:"declare default element namespace 'http://www.w3.org/1999/xhtml'; /html/head/meta[@http-equiv eq 'Content-Type']/@content = 'text/html; charset=UTF-8'" !method=text
echo $output
Expand Down