Changeset 2946 for trunk/bin/jenkins.sh


Ignore:
Timestamp:
Oct 15, 2013 10:18:49 AM (7 years ago)
Author:
bradbell
Message:

jenkins.sh: Another attempt to get jenkins to run adolc tests.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/jenkins.sh

    r2944 r2946  
    6060        libdir='lib'
    6161fi
    62 if which autoconf >& /dev/null
    63 then
    64         has_autoconf='yes'
    65 else
    66         has_autoconf='no'
    67 fi
    6862# -----------------------------------------------------------------------
    6963# The following test can be used to skip install of other packages
     
    9791        # and library files in
    9892        #       $trunk_dir/build/prefix/$libdir
    99         if [ $has_autoconf == 'yes' ]
    100         then
    101                 log_eval bin/get_colpack.sh
    102                 log_eval bin/get_adolc.sh
    103         fi
     93        log_eval bin/get_colpack.sh
     94        log_eval bin/get_adolc.sh
    10495        # -------------------------------------------------------------------
    10596fi
     
    127118        build_type=''
    128119fi
    129 if has_autoconf
    130 then
    131         adolc_dir="ADOLC_DIR=$trunk_dir/build/prefix"
    132 else
    133         adolc_dir=''
    134 fi
    135120#
    136121cat << EOF
    137122$trunk_dir/configure \\
    138123        $build_type \\
    139         $adolc_dir \\
     124        ADOLC_DIR="$trunk_dir/build/prefix" \\
    140125        SACADO_DIR="$trunk_dir/build/prefix" \\
    141126        EIGEN_DIR="$trunk_dir/build/prefix" \\
     
    145130EOF
    146131if ! $trunk_dir/configure $build_type \
    147         $adolc_dir \
     132        ADOLC_DIR="$trunk_dir/build/prefix" \\
    148133        SACADO_DIR="$trunk_dir/build/prefix" \
    149134        EIGEN_DIR="$trunk_dir/build/prefix" \
Note: See TracChangeset for help on using the changeset viewer.