summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2017-03-13 18:43:19 +0100
committerSebastian Pipping <sebastian@pipping.org>2017-03-13 18:45:31 +0100
commitce34ddfe9f64c2220e68a598f3e6c396f1e8df90 (patch)
tree1c9c811ec1f63a313987945c784b619fc809e891
parente064eb4c18872ae1b0949f19c82fe59cbee9f457 (diff)
downloadlibexpat-git-ce34ddfe9f64c2220e68a598f3e6c396f1e8df90.tar.gz
Travis: Inline .travis.sh for better integration
-rwxr-xr-x.travis.sh26
-rw-r--r--.travis.yml18
2 files changed, 17 insertions, 27 deletions
diff --git a/.travis.sh b/.travis.sh
deleted file mode 100755
index a5704e8e..00000000
--- 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 b609a079..c9483c67 100644
--- 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}