Changeset 2943


Ignore:
Timestamp:
Oct 15, 2013 2:17:04 AM (6 years ago)
Author:
bradbell
Message:

Supress jenkins running adolc tests when autoconf not present on
remote machine (current colpack install fails).

Location:
trunk/bin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/get_adolc.sh

    r2940 r2943  
    121121fi
    122122# -----------------------------------------------------------------------------
    123 if which autoconf > /dev/null
     123if which autoconf >& /dev/null
    124124then
    125125        echo_eval autoreconf -f -i
  • trunk/bin/get_colpack.sh

    r2940 r2943  
    9393echo_eval cd ColPack-$version
    9494# -----------------------------------------------------------------------------
    95 if which autoconf > /dev/null
     95if which autoconf >& /dev/null
    9696then
    9797        echo_eval rm aclocal.m4 ltmain.sh
  • trunk/bin/jenkins.sh

    r2942 r2943  
    6060        libdir='lib'
    6161fi
     62if which autoconf >& /dev/null
     63then
     64        has_autoconf='yes'
     65else
     66        has_autoconf='no'
     67fi
    6268# -----------------------------------------------------------------------
    6369# The following test can be used to skip install of other packages
     
    9197        # and library files in
    9298        #       $trunk_dir/build/prefix/$libdir
    93         log_eval bin/get_colpack.sh
    94         log_eval bin/get_adolc.sh
     99        if has_autoconf
     100        then
     101                log_eval bin/get_colpack.sh
     102                log_eval bin/get_adolc.sh
     103        fi
    95104        # -------------------------------------------------------------------
    96105fi
     
    118127        build_type=''
    119128fi
     129if has_autoconf
     130then
     131        adolc_dir="ADOLC_DIR=$trunk_dir/build/prefix"
     132else
     133        adolc_dir=''
     134fi
    120135#
    121136cat << EOF
    122137$trunk_dir/configure \\
    123138        $build_type \\
    124         ADOLC_DIR="$trunk_dir/build/prefix" \\
     139        $adolc_dir \\
    125140        SACADO_DIR="$trunk_dir/build/prefix" \\
    126141        EIGEN_DIR="$trunk_dir/build/prefix" \\
     
    130145EOF
    131146if ! $trunk_dir/configure $build_type \
    132         ADOLC_DIR="$trunk_dir/build/prefix" \
     147        $adolc_dir \
    133148        SACADO_DIR="$trunk_dir/build/prefix" \
    134149        EIGEN_DIR="$trunk_dir/build/prefix" \
Note: See TracChangeset for help on using the changeset viewer.