diff options
| -rwxr-xr-x | jenkins.sh | 20 |
1 files changed, 5 insertions, 15 deletions
@@ -67,8 +67,8 @@ runtests=false # Target to build for target="" -# File with value for --testcontainer= option -testcontainer_file="" +# ABE's --testcontainer= option +testcontainer_opt="" # Whether attempt bootstrap try_bootstrap=false @@ -94,7 +94,7 @@ rebuild=true orig_parameters="$@" -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: -- "$@")" +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:,testcontainer:,bootstrap,help,excludecheck:,norebuild,extraconfig: -- "$@")" while test $# -gt 0; do case $1 in --gcc-branch) change="$change gcc=$2"; shift ;; @@ -104,7 +104,7 @@ while test $# -gt 0; do -g|--gitrepo) git_reference=$2; shift ;; --abedir) abe_dir=$2; shift ;; -t|--target) target=$2; shift ;; - --testcontainerfile) testcontainer_file=$2; shift ;; + --testcontainer) testcontainer_opt=" --testcontainer $2"; shift ;; -w|--workspace) user_workspace=$2; shift ;; -o|--options) user_options=$2; shift ;; --logserver) logserver=$2; shift ;; @@ -372,17 +372,7 @@ if $runtests; then fi check="--check all" - check="${check}${excludecheck_opt}" - - if [ x"$testcontainer_file" != x"" ]; then - if [ ! -f "$testcontainer_file" ]; then - echo "ERROR: Cannot start test container" - exit 1 - fi - - check="$check --testcontainer $(cat "$testcontainer_file")" - fi - + check="${check}${excludecheck_opt}${testcontainer_opt}" # This second call to abe.sh will (re)generate the manifest, # possibly creating a second one if the two calls to abe.sh take |