From 356244b54b9552634f351e26b440391b60b34f52 Mon Sep 17 00:00:00 2001
From: Markus Pfeiffer <markus.pfeiffer@morphism.de>
Date: Fri, 19 Aug 2016 14:56:42 +0100
Subject: [PATCH] Use CI script in travis

---
 .travis.yml | 7 +------
 etc/ci.sh   | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5bc7c2797e6..f0a69ce3de7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,9 +59,4 @@ script:
   - ./configure --with-gmp=system
   - make
   - make bootstrap-pkg-full
-  - if [[ x"$ABI" != "x32" ]] ; then cd pkg/io* ; ./configure ; make ; cd ../.. ; cd pkg/profiling* ; ./configure ; make ; cd ../.. ; fi
-  - if [[ $TEST_SUITE = 'makemanuals' && $TRAVIS_OS_NAME = 'linux' ]]; then make manuals ; cat doc/*/make_manuals.out ; if [ `cat doc/*/make_manuals.out | grep -c "manual.lab written"` != '3' ]; then echo "Build failed"; exit 1; fi; fi
-  - if [[ $TEST_SUITE != 'makemanuals' && x"$ABI" != "x32" ]]; then echo "Read(\"tst/${TEST_SUITE}.g\"); quit;" | sh bin/gap.sh --cover coverage | tee testlog.txt | grep --colour=always -E "########> Diff|$" ; echo "CoverToJson(\"coverage\", \"coverage.json\"); quit;" | sh bin/gap.sh etc/cover2json.g ; cd bin/x86* ; gcov -o . ../../src/* ; cd ../.. ; cat testlog.txt | tail -n 2 | grep "total"; ( ! grep "########> Diff" testlog.txt ) ; fi
-  - if [[ $TEST_SUITE != 'makemanuals' && x"$ABI" = "x32" ]]; then echo "Read(\"tst/${TEST_SUITE}.g\"); quit;" | sh bin/gap.sh | tee testlog.txt | grep --colour=always -E "########> Diff|$" ; cat testlog.txt | tail -n 2 | grep "total"; ( ! grep "########> Diff" testlog.txt ) ; fi
-  
-
+  - bash etc/ci.sh
diff --git a/etc/ci.sh b/etc/ci.sh
index e5dd185e3a3..ae70dbd49eb 100644
--- a/etc/ci.sh
+++ b/etc/ci.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Continous integration testing script
 
@@ -22,7 +22,7 @@ else
         cd pkg/io*
         ./configure
         make
-        cd ../.
+        cd ../..
         cd pkg/profiling*
         ./configure
         make