Travis: Inline .travis.sh for better integration

diff --git a/.travis.sh b/.travis.sh
deleted file mode 100755 (executable)
index a5704e8..0000000
--- a/.travis.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/bash
-# Copyright (C) 2017 Sebastian Pipping <sebastian@pipping.org>
-# Licensed under the MIT license
-set -e
-
-PS4='# '
-set -x
-
-
-ret=0
-
-
-# Run test suite
-cd expat
-
-for mode in \
-        address \
-        lib-coverage \
-        ; do
-    git clean -X -f
-    ./buildconf.sh
-    CFLAGS='-g -pipe' ./qa.sh ${mode} || ret=1
-done
-
-
-exit ${ret}

diff --git a/.travis.yml b/.travis.yml
index b609a0796cfcefb7def86011c799e9f63a1b65cd..c9483c675f0a5aee12caa1dbbbe66f86b6e9883b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Copyright (C) 2017 Sebastian Pipping <sebastian@pipping.org>
+# Licensed under the MIT license
+
 language: cpp
 dist: trusty
 
@@ -9,4 +12,17 @@ addons:
 install:
   - wget -O expat/tests/xmlts.zip https://www.w3.org/XML/Test/xmlts20080827.zip
 
-script: ./.travis.sh
+script:
+  - cd expat
+  - |
+    set -e
+    ret=0
+    for mode in \
+            address \
+            lib-coverage \
+            ; do
+        git clean -X -f
+        ./buildconf.sh
+        CFLAGS='-g -pipe' ./qa.sh ${mode} || ret=1
+    done
+    exit ${ret}