# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1484858119 0
# Node ID 9031662ee17c9473c240a7772a0f496cd39ebba7
# Parent  f6bc77c5cd615e94caf289eb59b750a4cc1d90f7# Parent  0137d0b9e427e98f5c80a140d4be982a9bd58053
Merge

diff -r f6bc77c5cd61 -r 9031662ee17c .travis.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.travis.yml	Thu Jan 19 20:35:19 2017 +0000
@@ -0,0 +1,17 @@
+language: python
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - ( cd ../ ; git clone https://github.com/sandstorm-io/capnproto )
+  - ( cd ../capnproto/c++ ; ./setup-autotools.sh && autoreconf -i )
+  - ( cd ../capnproto/c++ ; ./configure && make && make install )
+
+install:
+  - sudo pip install jsonschema
+
+script:
+  - ./check.sh
+
diff -r f6bc77c5cd61 -r 9031662ee17c capnp/check.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/capnp/check.sh	Thu Jan 19 20:35:19 2017 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+mydir=$(dirname "$0")
+
+set -eu
+
+echo
+
+for c in "$mydir"/*.capnp ; do
+    echo "Checking $c..." 1>&2
+    capnpc -o- "$c" >/dev/null
+done
+
+echo OK
diff -r f6bc77c5cd61 -r 9031662ee17c check.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/check.sh	Thu Jan 19 20:35:19 2017 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+mydir=$(dirname "$0")
+
+set -eu
+
+"$mydir"/capnp/check.sh
+"$mydir"/json/check.sh
diff -r f6bc77c5cd61 -r 9031662ee17c json/check.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/check.sh	Thu Jan 19 20:35:19 2017 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+mydir=$(dirname "$0")
+
+set -eu
+
+echo
+
+for ex in "$mydir"/examples/*.json ; do
+    echo "Checking $ex..." 1>&2
+    jsonschema -i "$ex" "$mydir"/schema/$(basename "$ex" | sed 's/-[^.]*//')
+done
+
+for s in "$mydir"/schema/*.json ; do
+    if [ ! -f "$mydir"/examples/$(basename "$s") ]; then
+        if ! ls -1 "$mydir"/examples/$(basename "$s" .json)-*.json >/dev/null 2>&1; then
+	    echo "WARNING: No example file for schema $s"
+        fi
+    fi
+done
+
+echo OK
diff -r f6bc77c5cd61 -r 9031662ee17c json/test.sh
--- a/json/test.sh	Thu Jan 19 09:30:19 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-for ex in examples/*.json ; do
-    echo "Checking $ex..." 1>&2
-    jsonschema -i "$ex" schema/$(basename "$ex" | sed 's/-[^.]*//')
-done
-
-for s in schema/*.json ; do
-    if [ ! -f examples/$(basename "$s") ]; then
-        if ! ls -1 examples/$(basename "$s" .json)-*.json >/dev/null 2>&1; then
-	    echo "WARNING: No example file for schema $s"
-        fi
-    fi
-done
-