diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-05-16 14:51:58 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-05-16 14:51:58 +0000 |
| commit | 295aaf9a1373cdf4345dc36c38cc3773cb79790b (patch) | |
| tree | 5305413f93b1576891ecb4acf947e84fabe12c45 /tcwg-benchmark-christophe.yaml | |
| parent | 360f1bb55e0a225a4d43e4853d37e30f1f70d777 (diff) | |
tcwg-benchmark-christophe: Improve ccprefix handling
... to support armv8l-linux-gnueabihf
Change-Id: I6295ca5d1689b17c230e3c90f53693547e4e2a2e
Diffstat (limited to 'tcwg-benchmark-christophe.yaml')
| -rw-r--r-- | tcwg-benchmark-christophe.yaml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tcwg-benchmark-christophe.yaml b/tcwg-benchmark-christophe.yaml index 900bdcfa2f..4452a11d8d 100644 --- a/tcwg-benchmark-christophe.yaml +++ b/tcwg-benchmark-christophe.yaml @@ -90,6 +90,8 @@ tarball=$(basename ${toolchain_url}) tar xf ${tarball} toolchaindir=$(echo ${tarball} | sed 's/.tar.xz//') + ccpath=$(find $WORKSPACE/$toolchaindir -name "*-gcc") + ccprefix=$(echo $ccpath | sed -e 's/-gcc$/-/') # Slaves for this job are virtual slaves on dev-01, # convert the slave name into the target board name @@ -103,15 +105,6 @@ ssh ${ssh_opts} $boardname rm -rf bmk-scripts ssh ${ssh_opts} $boardname git clone https://git-us.linaro.org/toolchain/bmk-scripts - case ${label} in - *-tx1-*) target=aarch64-linux-gnu- ;; - *-tk1-*) target=arm-linux-gnueabihf- ;; - *) - echo "ERROR: Unsupported label: ${label}" - exit 1 - ;; - esac - # Hack: populate tcwg-benchmark's known_hosts on the board #ssh -A ${ssh_opts} $boardname ssh ${ssh_opts} git@dev-private-git.linaro.org true || true #ssh -A ${ssh_opts} $boardname ssh ${ssh_opts} dev-01.tcwglab true || true @@ -131,7 +124,7 @@ build_container_exec ssh -t -A ${ssh_opts} $boardname bmk-scripts/run.sh \ --bench ${bench_list} \ --config ${config} \ - --ccprefix dev-01.tcwglab:${WORKSPACE}/${toolchaindir}/bin/${target} \ + --ccprefix $build_container_host:$build_container_port:$ccprefix \ --sysroot "$sysroot" \ --toolchain gnu \ --resultsdest ${fileserver}:results/${NODE_NAME}-123-0/${BUILD_NUMBER} \ |