tcwg-benchmark-bare.sh: Cleanup, add support for cflags, ldflags and forceinstall options

Change-Id: I2cc0ba3b45ff1251004205967fc4fa6e19f96bf7

1 files changed, 4 insertions, 24 deletions

diff --git a/tcwg-benchmark-bare.sh b/tcwg-benchmark-bare.sh
index 913cc7a6..efd81787 100755
--- a/tcwg-benchmark-bare.sh
+++ b/tcwg-benchmark-bare.sh
@@ -7,29 +7,16 @@ set -ex
 # Make shellcheck happy and workaround Jenkins not defining variables
 # for empty arguments.
 bench_container_tag="${bench_container_tag-bionic}"
-build_container_tag="${build_container_tag-bionic}"
-image_arch="$image_arch"
 toolchain_url="$toolchain_url"
 toolchain_type="${toolchain_type-auto}"
-bench_list="$bench_list"
 cflags="$cflags"
 ldflags="$ldflags"
-extension="$extension"
-testmode="$testmode"
-iterations="$iterations"
-run_profile="$run_profile"
 sysroot="$sysroot"
-fileserver="$fileserver"
 forceinstall="$forceinstall"
 builder="$builder"
-results_id="$results_id"
 BUILD_NUMBER="$BUILD_NUMBER"
 NODE_NAME="$NODE_NAME"
 WORKSPACE="$WORKSPACE"
-reboot="$reboot"
-prepare_board="${prepare_board-true}"
-ignore_errors="$ignore_errors"
-clean_older_than="$clean_older_than"
 
 # Jenkins doesn't define variables when parameter value is empty (like cflags),
 # so enable "set -u" only after above binding of variables.
@@ -49,7 +36,6 @@ fi
 ./start-container-docker.sh \
     $docker_host_opt \
     --distro "$bench_container_tag" \
-    --session-name "$BUILD_NUMBER-$JOB_NAME-bench" \
     --task bench \
     --docker_opts "--privileged -v /dev/bus/usb:/dev/bus/usb" \
     --prefix run_ > run-container.sh
@@ -89,11 +75,7 @@ case "$toolchain_url" in
 	fi
 	;;
     *)
-	# Make sure to cleanup build container if something goes
-	# wrong when preparing the test environment
-	#trap "cleanup_all_containers" EXIT
-	#./start-container-docker.sh $docker_host_opt --distro "$build_container_tag" --task build --prefix build_ --verbose true > build-container.sh
-	#. ./build-container.sh
+	# When we copy the toolchain, access it from the 'run' container
 	build_container_host=$run_container_host
 	build_container_port=$run_container_port
 	;;
@@ -226,12 +208,10 @@ esac
 
 # vars are from run-container.sh sourced above
 # shellcheck disable=SC2154
-remote_exec "$run_container_host:$run_container_port:$WORKSPACE:-t -Snone" \
-	    pwd
-remote_exec "$run_container_host:$run_container_port:$WORKSPACE:-t -Snone" \
-	    ls -la $(pwd)
-
 remote_exec "$run_container_host:$run_container_port:$WORKSPACE/bmk-scripts:-t -Snone" \
 	    $(pwd)/bmk-scripts/coremark.sh \
 	    --ccprefix "$ccprefix" \
+	    --cflags "$cflags" \
+	    --ldflags "$ldflags" \
+	    --forceinstall "${forceinstall}" \
 	    --verbose true