diff options
Diffstat (limited to 'jenkins.sh')
-rwxr-xr-x | jenkins.sh | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -26,7 +26,7 @@ usage() { # Format this section with 75 columns. cat << EOF - jenkins.sh [--help] [-s snapshot dir] [g git reference dir] [abe path] [w workspace] + jenkins.sh [--help] [-s snapshot dir] [g git reference dir] [--abedir path] [w workspace] EOF return 0 } @@ -38,7 +38,7 @@ if test $# -lt 1; then fi # Directory of ABE source files -abe_dir="$(cd $(dirname $0); pwd)" +abe_dir= # This is where all the builds go if test x"${WORKSPACE}" = x; then @@ -97,7 +97,7 @@ rebuild=true orig_parameters="$@" -OPTS="`getopt -o s:g:c:w:o:l:rt:b:h -l override:,gcc-branch:,snapshots:,gitrepo:,abe:,workspace:,options:,logserver:,logname:,languages:,runtests,target:,testcontainerfile:,bootstrap,help,excludecheck:,norebuild,extraconfig: -- "$@"`" +OPTS="`getopt -o s:g:w:o:l:rt:b:h -l override:,gcc-branch:,snapshots:,gitrepo:,abedir:,workspace:,options:,logserver:,logname:,languages:,runtests,target:,testcontainerfile:,bootstrap,help,excludecheck:,norebuild,extraconfig: -- "$@"`" while test $# -gt 0; do case $1 in --gcc-branch) change="$change gcc=$2"; shift ;; @@ -105,7 +105,7 @@ while test $# -gt 0; do --extraconfig) change="${change} --extraconfig $2" ;; -s|--snapshots) user_snapshots=$2; shift ;; -g|--gitrepo) git_reference=$2; shift ;; - -c|--abe) abe_dir=$2; shift ;; + --abedir) abe_dir=$2; shift ;; -t|--target) target=$2; shift ;; --testcontainerfile) testcontainer_file=$2; shift ;; -w|--workspace) user_workspace=$2; shift ;; @@ -122,6 +122,11 @@ while test $# -gt 0; do shift done +if test x"${abe_dir}" = x; then + echo "Error: --abedir missing" + usage +fi + # Non matrix builds use node_selector, but matrix builds use NODE_NAME if test x"${node_selector}" != x; then node="`echo ${node_selector} | tr '-' '_'`" @@ -312,9 +317,6 @@ if test -e "${PWD}/host.conf"; then . "${PWD}/host.conf" fi -# This is the top level directory for the abe sources. -#abe_dir="${abe_path}" - # Delete the previous test result files to avoid problems. find ${user_workspace} -name \*.sum -exec rm {} \; 2>&1 > /dev/null |