Merge PR #890: Put CI script into shell script

gap-system · Sep 29, 2016 · 940739e · 940739e
2 parents b6874cf + f07ab00
commit 940739e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git 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
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# Continous integration testing script
+
+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
+else
+ if [[ x"$ABI" == "x32" ]]
+ then
+ echo "Read(\"tst/${TEST_SUITE}.g\"); quit;" |\
+ sh bin/gap.sh |\
+ tee testlog.txt |\
+ grep --colour=always -E "########> Diff|$"
+ else
+ cd pkg/io*
+ ./configure
+ make
+ cd ../..
+ cd pkg/profiling*
+ ./configure
+ make
+ cd ../..
+ 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 ../..
+ fi;
+ cat testlog.txt | tail -n 2 |\
+ grep "total"; ( ! grep "########> Diff" testlog.txt )
+fi;