diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-16 17:54:15 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-06-16 17:54:46 +0000 |
| commit | c2c4fa185a7ab3fac982bbe8167c034c4ff585ab (patch) | |
| tree | c7ff2906740efd1488316549fb3d8c4ee2f15cb6 /tcwg-benchmark.sh | |
| parent | 5cc5ea02e7c0f4550b6f8ba8b7073faeeeffc37f (diff) | |
tcwg-benchmark.sh: Don't depend on PWD being jenkins-scripts/ dir
Change-Id: I0408d481d933372d7511ae10e2e0c8c1ef5bac4c
Diffstat (limited to 'tcwg-benchmark.sh')
| -rwxr-xr-x | tcwg-benchmark.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 28db9425..fb479288 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -4,6 +4,7 @@ set -ex +scripts=$(dirname "$0") # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. bench_container_tag="${bench_container_tag-bionic}" @@ -41,7 +42,7 @@ else docker_host_opt="--label $builder" fi -. jenkins-helpers.sh +. $scripts/jenkins-helpers.sh # If $toolchain_url is of ssh:// type, don't create a remote build # container, just use the ssh command as provided. @@ -79,7 +80,7 @@ case "$toolchain_url" in # 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_ > build-container.sh + $scripts/start-container-docker.sh $docker_host_opt --distro "$build_container_tag" --task build --prefix build_ > build-container.sh . ./build-container.sh ;; esac @@ -318,7 +319,7 @@ fi # Start a container to run the benchmarks in. # We install SPEC in /home/tcwg-benchmark, so bind-mount it as $WORKSPACE. -WORKSPACE=$HOME ./start-container-docker.sh --session-host "$boardname" --arch "$image_arch" --distro "$bench_container_tag" --task bench --docker_opts "--privileged" --prefix run_ > run-container.sh +WORKSPACE=$HOME $scripts/start-container-docker.sh --session-host "$boardname" --arch "$image_arch" --distro "$bench_container_tag" --task bench --docker_opts "--privileged" --prefix run_ > run-container.sh trap "cleanup_all_containers" EXIT . ./run-container.sh |