From 4d3bd50cb817326b9dd7c5ae1083a8fe19025d62 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Fri, 3 Jun 2016 10:02:51 +0200
Subject: [PATCH] Travis: opm-common/travis/build-and-test.sh

---
 .travis.yml                   | 29 ++++++++++++-----------------
 travis/clone-and-build-ert.sh | 11 -----------
 2 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100755 travis/clone-and-build-ert.sh

diff --git a/.travis.yml b/.travis.yml
index d6989fa59..693cc749a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,7 @@
 language: cpp
 
-matrix:
-  fast_finish: true
-  include:
-    - os: osx
-      osx_image: xcode7.3
-      compiler: clang
-    - os: linux
-      compiler: gcc
+compiler:
+  - gcc
 
 addons:
   apt:
@@ -20,17 +14,18 @@ addons:
       - g++-4.8
       - gfortran-4.8
       - liblapack-dev
-      - clang
-
-install:
-    - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8" FC="gfortran-4.8"; fi
+      - libgmp3-dev
+      - libsuitesparse-dev
+      - libeigen3-dev
 
+before_script:
+    - export CXX="g++-4.8" CC="gcc-4.8" FC="gfortran-4.8"
     - cd ..
-
     - git clone https://github.com/OPM/opm-common.git
-    - git clone https://github.com/OPM/opm-data.git
+    - opm-common/travis/clone-opm.sh opm-parser
+    - opm-common/travis/build-prereqs.sh
+    
+
+script: opm-common/travis/build-and-test.sh opm-parser
 
-    - opm-common/travis/build-opm-common-shared.sh
-    - opm-parser/travis/clone-and-build-ert.sh
 
-script: opm-parser/travis/build-and-test-opm-parser.sh
diff --git a/travis/clone-and-build-ert.sh b/travis/clone-and-build-ert.sh
deleted file mode 100755
index c2531dd82..000000000
--- a/travis/clone-and-build-ert.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-pushd . > /dev/null
-git clone https://github.com/Ensembles/ert.git
-cd ert
-mkdir build
-cd build
-cmake ../devel/
-make
-popd > /dev/null