about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPjotr Prins2020-05-28 06:30:28 -0500
committerPjotr Prins2020-05-28 06:30:28 -0500
commit98f1fa0bf59b0d4ba837d62d1327963727735b4c (patch)
treee67ea7cbe28f14873123b106cad1f36d2075ccb3
parentdfd0066a1e483ce807efc019f0b2de8decd9e33c (diff)
downloadpangemma-98f1fa0bf59b0d4ba837d62d1327963727735b4c.tar.gz
Travis
-rw-r--r--.travis.yml13
-rwxr-xr-xtest/dev_test_suite.sh2
2 files changed, 4 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index a6c9895..7a48f94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,12 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             # Our dev environment is a more recent GNU C++ and GSL2
-            - g++-4.9
+            - g++
             - libopenblas-dev 
             - zlib1g-dev
-            - libeigen3-dev
             - libgsl0-dev
-            - liblapack-dev
-            # - gfortran-dev for static
-      env:
-         - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && EIGEN_INCLUDE_PATH=/usr/include/eigen3"
     - os: osx
       compiler: clang
-      env:
-         - MATRIX_EVAL="EIGEN_INCLUDE_PATH=/usr/local/include/eigen3"
 #     - os: linux
 #       addons:
 #         apt:
@@ -41,8 +34,8 @@ script:
   - eval "${MATRIX_EVAL}"
   - $CXX --version
   # build and test debug version
-  - make      CXX=$CXX EIGEN_INCLUDE_PATH=$EIGEN_INCLUDE_PATH WITH_LAPACK=1 OPENBLAS_LEGACY=1 WITH_GSLCBLAS=1 -j 4 -k
-  - time make CXX=$CXX EIGEN_INCLUDE_PATH=$EIGEN_INCLUDE_PATH WITH_LAPACK=1 OPENBLAS_LEGACY=1 WITH_GSLCBLAS=1 check
+  - make      CXX=$CXX OPENBLAS_LEGACY=1 WITH_GSLCBLAS=1 -j 4 -k
+  - time make CXX=$CXX OPENBLAS_LEGACY=1 WITH_GSLCBLAS=1 check
   # - make clean
   # build and test release version (integration test mostly)
   # - make CXX=$CXX EIGEN_INCLUDE_PATH=$EIGEN_INCLUDE_PATH DEBUG= FORCE_DYNAMIC=1 WITH_OPENBLAS=1 OPENBLAS_LEGACY=1 -j 4
diff --git a/test/dev_test_suite.sh b/test/dev_test_suite.sh
index fe591ee..1fb3ba6 100755
--- a/test/dev_test_suite.sh
+++ b/test/dev_test_suite.sh
@@ -31,7 +31,7 @@ testBXDStandardRelatednessMatrixKSingularError() {
            -gk \
            -no-check \
            -o $outn
-    # assertEquals 130 $? # should show singular error
+    # assertEquals 130 $? # should show singular error FIXME
 }
 
 testBXDStandardRelatednessMatrixK() {