Merge pull request #522 from kmod/travis_additions

Add a couple tests to the travis-ci configuration

Merge pull request #522 from kmod/travis_additions
Add a couple tests to the travis-ci configuration
dae4f6b2 · Kevin Modzelewski · 384d37ec · dcff777b · dae4f6b2 · dae4f6b2
Commit dae4f6b2 authored Jul 14, 2015 by Kevin Modzelewski
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 1 deletion

.travis.yml .travis.yml +11 -1

test/integration/pyxl_test.py test/integration/pyxl_test.py +2 -0

tools/configure_travis.sh tools/configure_travis.sh +11 -0

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,15 @@ compiler:
  - clang
  - gcc

+env:
+  - TRAVIS_BUILD_TYPE=Debug
+  - TRAVIS_BUILD_TYPE=Release
+
+matrix:
+  exclude:
+    - compiler: gcc
+      env: TRAVIS_BUILD_TYPE=Debug
+
 # use travis-ci docker based infrastructure
 sudo: false

@@ -47,7 +56,7 @@ install:
  - git config --global user.name "Your Name"
  - mkdir ~/pyston-build && cd ~/pyston-build
  - make -C $TRAVIS_BUILD_DIR llvm_up
-  - cmake -GNinja -DTEST_THREADS=4 -DENABLE_EXTRA_TESTS=ON $TRAVIS_BUILD_DIR
+  - bash $TRAVIS_BUILD_DIR/tools/configure_travis.sh

 before_script:
  - mysql -e 'create database mysqldb_test charset utf8;'
@@ -56,6 +65,7 @@ script:
  - ccache -z
  - PYSTON_RUN_ARGS=G ninja -j4 pyston check-deps && ctest --output-on-failure
  - ccache -s
+  - if [ -n "$(git status --porcelain --untracked=no)" ]; then echo "test suite left the source directory dirty"; git status; false; fi

 os:
  - linux

--- a/test/integration/pyxl_test.py
+++ b/test/integration/pyxl_test.py
@@ -36,4 +36,6 @@ print
 print "Output: '%s'" % out
 assert out == "<html><body>Hello World!</body></html>\n"

+subprocess.check_call(["rm", "-rf", os.path.join(PYXL_DIR, "build")])
+
 print "PASSED"
--- a/tools/configure_travis.sh
+++ b/tools/configure_travis.sh
+#!/bin/bash
+
+set -exu
+
+CMAKE_ARGS="-GNinja -DTEST_THREADS=4 $TRAVIS_BUILD_DIR -DCMAKE_BUILD_TYPE=${TRAVIS_BUILD_TYPE}"
+
+if [ "${TRAVIS_BUILD_TYPE}" = "Release" ]; then
+    CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_EXTRA_TESTS=ON"
+fi
+
+cmake ${CMAKE_ARGS}