[24684] | 1 | Index: ../trunk-jpl/jenkins/linux64_ross
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/jenkins/linux64_ross (revision 24321)
|
---|
| 4 | +++ ../trunk-jpl/jenkins/linux64_ross (revision 24322)
|
---|
| 5 | @@ -12,7 +12,7 @@
|
---|
| 6 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 7 | --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
|
---|
| 8 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 9 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 10 | + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 11 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 12 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 13 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 14 | @@ -19,16 +19,19 @@
|
---|
| 15 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 16 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 17 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 18 | - --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
|
---|
| 19 | + --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
|
---|
| 20 | --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
|
---|
| 21 | --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
|
---|
| 22 | --with-numthreads=4 \
|
---|
| 23 | --enable-development \
|
---|
| 24 | - --enable-debugging '
|
---|
| 25 | + --enable-debugging \
|
---|
| 26 | +'
|
---|
| 27 |
|
---|
| 28 | -#PYTHON and MATLAB testing
|
---|
| 29 | +# Test suites
|
---|
| 30 | MATLAB_TEST=1
|
---|
| 31 | PYTHON_TEST=0
|
---|
| 32 | +JAVASCRIPT_TEST=0
|
---|
| 33 | +EXAMPLES_TEST=0
|
---|
| 34 |
|
---|
| 35 | #-----------------------------------#
|
---|
| 36 | # 3: External packages installation #
|
---|
| 37 | @@ -35,17 +38,19 @@
|
---|
| 38 | #-----------------------------------#
|
---|
| 39 |
|
---|
| 40 | #List of external packages to be installed and their installation scripts
|
---|
| 41 | -EXTERNALPACKAGES="autotools install.sh
|
---|
| 42 | - cmake install.sh
|
---|
| 43 | - mpich install-3.2-linux64.sh
|
---|
| 44 | - petsc install-3.7-linux64.sh
|
---|
| 45 | - triangle install-linux64.sh
|
---|
| 46 | - chaco install.sh
|
---|
| 47 | - m1qn3 install.sh
|
---|
| 48 | - hdf5 install.sh
|
---|
| 49 | - netcdf install.sh
|
---|
| 50 | - semic install.sh
|
---|
| 51 | - shell2junit install.sh"
|
---|
| 52 | +EXTERNALPACKAGES="
|
---|
| 53 | + autotools install.sh
|
---|
| 54 | + cmake install.sh
|
---|
| 55 | + mpich install-3.2-linux64.sh
|
---|
| 56 | + petsc install-3.7-linux64.sh
|
---|
| 57 | + triangle install-linux64.sh
|
---|
| 58 | + chaco install.sh
|
---|
| 59 | + m1qn3 install.sh
|
---|
| 60 | + hdf5 install-1.10.sh
|
---|
| 61 | + netcdf install-4.7.sh
|
---|
| 62 | + semic install.sh
|
---|
| 63 | + shell2junit install.sh
|
---|
| 64 | +"
|
---|
| 65 |
|
---|
| 66 | #-----------------#
|
---|
| 67 | # 4: test options #
|
---|