From 33088998c6a8dff938b7d6d89e390526510e3e22 Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Sat, 17 Nov 2018 21:53:59 +0000
Subject: [PATCH 1/2] Running 'schematron-test' with local Schematron code.
 I.e., not using Schematron version in XSpec distribution.

---
 .travis.yml           | 17 +++--------------
 trunk/schematron/test |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f88b0cf..ac1760d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
 language: generic
 env:
     global:
-        # XSpec version
-        - XSPEC_VERSION=1.0.0
-        #- XSPEC_HOME=/tmp/schematron/xspec/
         # full path to Saxon jar
         - SAXON_CP=/tmp/schematron/saxon/saxon9he.jar
-        # Ant version used in oXygen
-        - ANT_VERSION=1.9.8
         # full path to XML Resolver jar
         - XML_RESOLVER_CP=/tmp/schematron/xml-resolver/resolver.jar
+        - SCHEMATRON_XSLT_INCLUDE=$PWD/trunk/schematron/code/iso_dsdl_include.xsl
+        - SCHEMATRON_XSLT_EXPAND=$PWD/trunk/schematron/code/iso_abstract_expand.xsl
+        - SCHEMATRON_XSLT_COMPILE=$PWD/trunk/schematron/code/iso_svrl_for_xslt2.xsl
     matrix:
         # latest Saxon 9.8 version and full path to Jing jar
         - SAXON_VERSION=9.8.0-7
@@ -19,21 +17,12 @@ before_install:
     - unset _JAVA_OPTIONS
 
 before_script:
-    # install XSpec
-    - curl -fsSL --create-dirs -o /tmp/schematron/xspec/xspec.zip https://github.com/xspec/xspec/archive/v${XSPEC_VERSION}.zip;
-    - unzip /tmp/schematron/xspec/xspec.zip -d /tmp/schematron/xspec;
-    - export XSPEC_HOME=/tmp/schematron/xspec/xspec-${XSPEC_VERSION};
     # install Saxon
     - curl -fsSL --create-dirs -o ${SAXON_CP} http://central.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}.jar
-    # install Ant
-    - curl -fsSL --create-dirs -o /tmp/schematron/ant/ant.tar.gz http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz
-    - tar xf /tmp/schematron/ant/ant.tar.gz -C /tmp/schematron/ant;
-    - export PATH=/tmp/schematron/ant/apache-ant-${ANT_VERSION}/bin:{$PATH}
     # install XML Resolver
     - curl -fsSL --create-dirs -o ${XML_RESOLVER_CP} http://central.maven.org/maven2/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar
 
 script:
-    - ant -version
     - cd trunk/schematron/test
     - echo "execute bats unit tests"
     - bats --tap schematron.bats
diff --git a/trunk/schematron/test b/trunk/schematron/test
index b9182de..efde643 160000
--- a/trunk/schematron/test
+++ b/trunk/schematron/test
@@ -1 +1 @@
-Subproject commit b9182deab178f340300d66f806e535369b183da3
+Subproject commit efde643458073aa681b2dc4c3836b323af1da2ae

From 39f1ce58787ed5c26744764ea98ca6c4b02806a1 Mon Sep 17 00:00:00 2001
From: travis4schematron <43503998+travis4schematron@users.noreply.github.com>
Date: Sat, 17 Nov 2018 22:22:10 +0000
Subject: [PATCH 2/2] Had lost $XSPEC_HOME.

---
 .hgignore   | 0
 .travis.yml | 1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 .hgignore

diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.travis.yml b/.travis.yml
index ac1760d..b1774a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
         - SCHEMATRON_XSLT_INCLUDE=$PWD/trunk/schematron/code/iso_dsdl_include.xsl
         - SCHEMATRON_XSLT_EXPAND=$PWD/trunk/schematron/code/iso_abstract_expand.xsl
         - SCHEMATRON_XSLT_COMPILE=$PWD/trunk/schematron/code/iso_svrl_for_xslt2.xsl
+        - XSPEC_HOME=$PWD/trunk/schematron/test/xspec-dist
     matrix:
         # latest Saxon 9.8 version and full path to Jing jar
         - SAXON_VERSION=9.8.0-7