diff options
author | Arnout Vandecappelle <arnout@mind.be> | 2017-07-21 03:05:24 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-25 23:03:28 +0200 |
commit | e7b9afa70a2fe643ffc28151b382e41218a106b8 (patch) | |
tree | 5a04b3ff0d7074f4fa223a6e635d70f207ac269a | |
parent | ff10c72920a3c5bb92e8a894ef27cc23112459fa (diff) | |
download | buildroot-e7b9afa70a2fe643ffc28151b382e41218a106b8.tar.gz buildroot-e7b9afa70a2fe643ffc28151b382e41218a106b8.zip |
test-pkg: get configs from in-tree toolchain-configs.csv
Now we have the toolchain config fragments in the buildroot directory
itself, it is no longer necessary to fetch it from the toolchain URL.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rwxr-xr-x | utils/test-pkg | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/utils/test-pkg b/utils/test-pkg index 25a25e2048..8c60649b32 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-configs.csv' +TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' main() { local o O opts @@ -50,8 +50,7 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(curl -s "${TOOLCHAINS_URL}" \ - |sed -r -e 's/,.*//; /internal/d;' \ + toolchains=($(sed -r -e 's/,.*//; /internal/d;' "${TOOLCHAINS_CSV}" \ |if [ ${random} -gt 0 ]; then \ sort -R |head -n ${random} else @@ -71,7 +70,6 @@ main() { nb_legal=0 for toolchainconfig in "${toolchains[@]}"; do : $((nb++)) - # Using basename(1) on a URL works nicely toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} @@ -90,17 +88,13 @@ main() { build_one() { local dir="${1}" - local url="${2}" + local toolchainconfig="${2}" local cfg="${3}" local pkg="${4}" mkdir -p "${dir}" - if ! curl -s "${url}" >"${dir}/.config"; then - return 2 - fi - - cat "support/config-fragments/minimal.config" "${cfg}" >>"${dir}/.config" + cat "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" >>"${dir}/.config" if ! make O="${dir}" olddefconfig > "${dir}/logfile" 2>&1; then return 2 |