tcwg-dev-build.sh: Allow passing --check option to MakeRelease.job

... and in turn allow MakeRelease.job to pass the option to Abe.

This enables using tcwg-dev-build.sh to run the components' testsuites.

Change-Id: Icc4d64336c56e821a537dc531793de561823d716

2 files changed, 12 insertions, 2 deletions

diff --git a/MakeRelease.job b/MakeRelease.job
index a60f8a0b..c62cabd3 100755
--- a/MakeRelease.job
+++ b/MakeRelease.job
@@ -22,6 +22,7 @@ usage() {
     echo "     --logsdir XXX - Specify where to upload the logs"
     echo "     --canadian - Perform a Canadian-cross build too"
     echo "     --buildnumber XXX - Specify build number"
+    echo "     --check XXX - Specify package to test"
     echo "     --help"
     exit $ret
 }
@@ -63,8 +64,9 @@ manifest_src=
 toolchain_config=
 artifacts_top="releases"
 manifest_validation=true
+check=
 
-getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:,artifacts_top:,manifest_validation: -Q
+getopt -o h -l target:,release_name:,fileserver:,workspace:,toolchainconfig:,manifest:,glibc:,gcc:,binutils:,help,abedir:,binariesdir:,logsdir:,canadian,buildnumber:,artifacts_top:,manifest_validation:,check: -Q
 while test $# -gt 0; do
     case $1 in
 	--abedir) abe_dir=$2 ; shift ;;
@@ -83,6 +85,7 @@ while test $# -gt 0; do
         --buildnumber) buildnumber=$2 ; shift ;;
 	--artifacts_top) artifacts_top=$2; shift ;;
 	--manifest_validation) manifest_validation=$2; shift ;;
+	--check) check=("--check" "$2"); shift ;;
         -h|--help) usage 0 ;;
 	--) break ;;
         *) usage ;;
@@ -188,7 +191,7 @@ fi
 # build the mingw32 compiler only if the previous cross-compiler build was
 # successful.
 if test ${abe_ret} -eq 0; then
-    $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts ${user_workspace}/artifacts2.txt ${update} --release ${release} --tarbin ${srcs} $target_opt ${host} --build all ${extra} >> ${logfile}
+    $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts ${user_workspace}/artifacts2.txt ${update} --release ${release} --tarbin ${srcs} $target_opt ${host} --build all ${extra} "${check[@]}" >> ${logfile}
     abe_ret=$?
     manifests+=( "$(read_var ${user_workspace}/artifacts2.txt manifest)" )
 fi
diff --git a/tcwg-dev-build.sh b/tcwg-dev-build.sh
index 3a122725..1dfb4248 100755
--- a/tcwg-dev-build.sh
+++ b/tcwg-dev-build.sh
@@ -24,6 +24,7 @@ buildnumber="${buildnumber-0}"
 target="${target-$default_target}"
 version="${version-default}"
 verbose="${verbose-true}"
+check="${check-}"
 
 set -u
 
@@ -45,6 +46,11 @@ if [ x"$target" = x"native" ]; then
     manifest_validation_opt="--manifest_validation false"
 fi
 
+check_opt=
+if [ -n "$check" ]; then
+    check_opt=("--check" "$check")
+fi
+
 # shellcheck disable=SC2154
 $scripts/MakeRelease.job \
     --abedir "$(pwd)"/abe \
@@ -56,5 +62,6 @@ $scripts/MakeRelease.job \
     --workspace "$(pwd)" \
     $manifest_opt \
     $manifest_validation_opt \
+    "${check_opt[@]}" \
     ${binutils:+--binutils "$binutils"} \
     ${gcc:+--gcc "$gcc"}