testing tweaks

.travis.yml

@@ -5,44 +5,23 @@ language: cpp
 # addons:
 matrix:
   include:
-    - env: COMPILER=clang++-3.8  
-      addons: { apt: { packages: ["clang-3.8"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"] } }
-
-    - env: COMPILER=clang++-5.0  
-      addons: &defaults { apt: { packages: ["clang-5.0"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] } }
-
     - env: COMPILER=g++-5  
       addons: { apt: { packages: ["g++-5"], sources: ["ubuntu-toolchain-r-test"] } }
 
     - env: COMPILER=g++-7  
       addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
 
+    # - env: COMPILER=clang++-3.8  
+    #   addons: { apt: { packages: ["clang-3.8"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"] } }
+
+    # - env: COMPILER=clang++-5.0  
+    #   addons: &defaults { apt: { packages: ["clang-5.0"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] } }
+
 
 install:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
-  - if [[ "${LLVM_VERSION}" != "" ]]; then
-      LLVM_DIR=${DEPS_DIR}/llvm-${LLVM_VERSION}
-      if [[ -z "$(ls -A ${LLVM_DIR})" ]]; then
-        LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
-        LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"
-        LIBCXXABI_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz"
-        CLANG_URL="http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz"
-        mkdir -p ${LLVM_DIR} ${LLVM_DIR}/build ${LLVM_DIR}/projects/libcxx ${LLVM_DIR}/projects/libcxxabi ${LLVM_DIR}/clang
-        travis_retry wget --quiet -O - ${LLVM_URL}      | tar --strip-components=1 -xJ -C ${LLVM_DIR}
-        travis_retry wget --quiet -O - ${LIBCXX_URL}    | tar --strip-components=1 -xJ -C ${LLVM_DIR}/projects/libcxx
-        travis_retry wget --quiet -O - ${LIBCXXABI_URL} | tar --strip-components=1 -xJ -C ${LLVM_DIR}/projects/libcxxabi
-        travis_retry wget --quiet -O - ${CLANG_URL}     | tar --strip-components=1 -xJ -C ${LLVM_DIR}/clang
-        (cd ${LLVM_DIR}/build && cmake .. -DCMAKE_INSTALL_PREFIX=${LLVM_DIR}/install -DCMAKE_CXX_COMPILER=clang++)
-        (cd ${LLVM_DIR}/build/projects/libcxx && make install -j2)
-        (cd ${LLVM_DIR}/build/projects/libcxxabi && make install -j2)
-      fi
-      export CXXFLAGS="-nostdinc++ -isystem ${LLVM_DIR}/install/include/c++/v1"
-      export LDFLAGS="-L ${LLVM_DIR}/install/lib -l c++ -l c++abi"
-      export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_DIR}/install/lib"
-      export PATH="${LLVM_DIR}/clang/bin:${PATH}"
-    fi
   - ${CXX} --version
 
 script:
-    - ./test/run_tests $COMPILER
+    - ./test/run_tests 
 

Makefile

@@ -2,8 +2,7 @@ REL_ARTIFACT  = metacache
 DBG_ARTIFACT  = metacache_debug
 
 #COMPILER     = nvcc
-COMPILER     = g++
-MPI_COMPILER = mpicxx
+COMPILER     = $(CXX)
 DIALECT      = -std=c++11
 WARNINGS     = -Wall -Wextra -Wpedantic
 OPTIMIZATION = -O3 

test/run_tests

@@ -10,8 +10,6 @@ cd $dir
 # ---------------------------------------------------------
 # parse command line arguments
 # ---------------------------------------------------------
-COMPILER=g++
-
 if [ $# -ge 1 ]; then
   if [ "$1" == "clean" ]; then
     rm *.db
@@ -27,8 +25,6 @@ if [ $# -ge 1 ]; then
         exit
       fi
     fi
-  else
-    COMPILER=$1
   fi
 fi
 
@@ -47,7 +43,7 @@ tar zxvf taxonomy.tar.gz
 # ---------------------------------------------------------
 pushd .
 cd ..
-make -j8 COMPILER=$COMPILER
+make -j8 
 popd