Fixed what has changed in master to make it work with the new test-suite

Also activated parallel tests. This might crash as some tests might still fail in parallel

.travis.yml

@@ -10,16 +10,12 @@ addons:
         - openmpi-bin
         - libopenmpi-dev
 env:
-## Uncomment the following line if you want to run also the interface tests
-#   - W90TESTSWITHINTERFACE=true
-   - W90TESTSWITHINTERFACE=false W90BINARYPARALLEL=false
-   - W90TESTSWITHINTERFACE=false W90BINARYPARALLEL=true
+   - W90BINARYPARALLEL=false
+   - W90BINARYPARALLEL=true
 install:
-# Possibly install QE and other interface code
-    - ./test-suite2/tools/external-codes/get-external-codes.sh
 # Install Wannier
-    - ./test-suite/travis_copy_make.inc.sh
-    - make -j default
+    - ./test-suite2/tools/configure_travis_compilation.sh
+    - make -j default w90chk2chk
 script:
     - ./test-suite2/tools/run_tests_travis.sh
 git:

test-suite2/tools/configure_travis_compilation.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#Stop the full script if one line crashes
+set -e
+
+## Set here, if needed, the location of the executables
+TESTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+cd "$TESTDIR"
+
+# Move the correct make.inc to prepare compilation
+if [ "$W90BINARYPARALLEL" == "true" ]
+then
+    cp config/TravisCI/make.inc.gfort+openmpi ../make.inc
+else
+    cp config/TravisCI/make.inc.gfort ../make.inc 
+fi

test-suite2/tools/run_tests_travis.sh

@@ -4,25 +4,14 @@ set -e
 
 ## Set here, if needed, the location of the executables
 TESTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-export ESPRESSO_ROOT="${TESTDIR}/tools/external-codes/espresso/"
-
 cd "$TESTDIR"
 
-## Get the external codes, but only if the environment variable
-## W90TESTSWITHINTERFACE is set to true
-if [ "$W90TESTSWITHINTERFACE" == "true" ]
-then
-    # Only tests involving interfaces
-    ./run_tests --category=interface_only
-elif [ "$W90TESTSWITHINTERFACE" == "false" ]
-then
-    # Only wannier tests
-    ./run_tests --category=wannier_only
-elif [ "$W90TESTSWITHINTERFACE" == "all" ]
+# Default: serial, no mpirun. Run these in any case
+./run_tests --category=default 
+if [ "$W90BINARYPARALLEL" == "true" ]
 then
-    # Only wannier tests
-    ./run_tests --category=all
-else
-    # By default: run default tests
-    ./run_tests -d
+  # If running in parallel: run also the tests in parallel
+  # I hardcode this to four, in case change it or set it as an ENV
+  # var in the .travis.yml
+  make ./run_tests --category=default --num-procs=4
 fi