Index: ../trunk-jpl/jenkins/linux64_ross =================================================================== --- ../trunk-jpl/jenkins/linux64_ross (revision 24321) +++ ../trunk-jpl/jenkins/linux64_ross (revision 24322) @@ -12,7 +12,7 @@ --with-matlab-dir=$MATLAB_PATH \ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \ + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi" \ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ @@ -19,16 +19,19 @@ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ - --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ + --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \ --with-numthreads=4 \ --enable-development \ - --enable-debugging ' + --enable-debugging \ +' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# # 3: External packages installation # @@ -35,17 +38,19 @@ #-----------------------------------# #List of external packages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-linux64.sh - petsc install-3.7-linux64.sh - triangle install-linux64.sh - chaco install.sh - m1qn3 install.sh - hdf5 install.sh - netcdf install.sh - semic install.sh - shell2junit install.sh" +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.2-linux64.sh + petsc install-3.7-linux64.sh + triangle install-linux64.sh + chaco install.sh + m1qn3 install.sh + hdf5 install-1.10.sh + netcdf install-4.7.sh + semic install.sh + shell2junit install.sh +" #-----------------# # 4: test options #