Merge pull request #135 from Toxaris/topic/travis-simple

Travis: run all tests from allTests.sh
Toxaris · Feb 8, 2015 · 0cefcd8 · 0cefcd8
2 parents 0954d1b + 84c8321
commit 0cefcd8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,3 +8,6 @@ cache:
   directories:
   - ~/.cabal
   - ~/.ghc
+script:
+  - ./mostTests.sh
+  - cabal install dist/*.tar.gz --enable-tests
diff --git a/allTests.sh b/allTests.sh
@@ -1,18 +1,5 @@
 #!/bin/sh -x
-[ -z "$CABAL" ] && CABAL=cabal
-
-set -e
-
-$CABAL clean
-$CABAL check
-
-$CABAL install --only-dependencies --enable-tests
-$CABAL configure --enable-tests
-$CABAL build
-
-$CABAL sdist
-
-dist/build/tests/tests --hide-successes --maximum-generated-tests=10000 --maximum-unsuitable-generated-tests=10000 --jxml=junit-log.xml
+. mostTests.sh
 
 nameBase=`runhaskell src-tools/package-info.hs --package`
 $CABAL install dist/$nameBase.tar.gz --enable-tests
diff --git a/mostTests.sh b/mostTests.sh
@@ -0,0 +1,16 @@
+#!/bin/sh -x
+[ -z "$CABAL" ] && CABAL=cabal
+
+set -e
+
+rm -rf dist
+$CABAL clean
+$CABAL check
+
+$CABAL install --only-dependencies --enable-tests
+$CABAL configure --enable-tests
+$CABAL build
+
+$CABAL sdist
+
+dist/build/tests/tests --hide-successes --maximum-generated-tests=10000 --maximum-unsuitable-generated-tests=10000 --jxml=junit-log.xml
diff --git a/pts.cabal b/pts.cabal
@@ -13,6 +13,7 @@ Extra-source-files:  examples/Arithmetics.lpts
                      examples/ChurchNumbers.lpts
                      examples/Functions.lpts
                      examples/Inference.lpts
+                     examples/Syntax.lpts
 Data-files:          emacs/pts-mode.el
 Cabal-version:       >= 1.8