* [Buildroot] [PATCH 1/7 v4] supprt/test-pkg: fix code style
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 15:02 ` Thomas Petazzoni
2017-02-12 14:53 ` [Buildroot] [PATCH 2/7 v4] support/scripts: check the config snippet exists Yann E. MORIN
` (5 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
support/scripts/test-pkg | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index b867da8..9066fa0 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -10,7 +10,7 @@ main() {
o='hc:d:p:r:'
O='help,config-snippet:build-dir:package:,random:'
- opts="$( getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}" )"
+ opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")"
eval set -- "${opts}"
random=0
@@ -46,14 +46,14 @@ 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;' \
- |if [ ${random} -gt 0 ]; then \
- sort -R |head -n ${random}
- else
- cat
- fi |sort
- )
+ toolchains=($(curl -s "${TOOLCHAINS_URL}" \
+ |sed -r -e 's/,.*//; /internal/d;' \
+ |if [ ${random} -gt 0 ]; then \
+ sort -R |head -n ${random}
+ else
+ cat
+ fi |sort
+ )
)
if [ ${#toolchains[@]} -eq 0 ]; then
@@ -73,7 +73,7 @@ build_one() {
local toolchain line skip
# Using basename(1) on a URL works nicely
- toolchain="$( basename "${url}" .config )"
+ toolchain="$(basename "${url}" .config)"
printf "%40s: " "${toolchain}"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/7 v4] support/scripts: check the config snippet exists
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
2017-02-12 14:53 ` [Buildroot] [PATCH 1/7 v4] supprt/test-pkg: fix code style Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 15:02 ` Thomas Petazzoni
2017-02-12 14:53 ` [Buildroot] [PATCH 3/7 v4] support/test-pkg: simplify the config check Yann E. MORIN
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
support/scripts/test-pkg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index 9066fa0..11ec18c 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -39,6 +39,9 @@ main() {
if [ -z "${cfg}" ]; then
printf "error: no config snippet specified\n" >&2; exit 1
fi
+ if [ ! -e "${cfg}" ]; then
+ printf "error: %s: no such file\n" "${cfg}" >&2; exit 1
+ fi
if [ -z "${dir}" ]; then
dir="${HOME}/br-test-pkg"
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/7 v4] support/scripts: check the config snippet exists
2017-02-12 14:53 ` [Buildroot] [PATCH 2/7 v4] support/scripts: check the config snippet exists Yann E. MORIN
@ 2017-02-12 15:02 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2017-02-12 15:02 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 Feb 2017 15:53:06 +0100, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> support/scripts/test-pkg | 3 +++
> 1 file changed, 3 insertions(+)
Applied to master, after adjusting the commit title to
support/test-pkg, in order to be consistent with other patches in the
series.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/7 v4] support/test-pkg: simplify the config check
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
2017-02-12 14:53 ` [Buildroot] [PATCH 1/7 v4] supprt/test-pkg: fix code style Yann E. MORIN
2017-02-12 14:53 ` [Buildroot] [PATCH 2/7 v4] support/scripts: check the config snippet exists Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 15:02 ` Thomas Petazzoni
2017-02-12 14:53 ` [Buildroot] [PATCH 4/7 v4] support/test-pkg: be less verbose Yann E. MORIN
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Use comm(1) to check that all our config options are properly set in the
resulting configuration, rather than our canned and fragile code.
Reported-by: Cam Hutchison <camh@xdna.net>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
support/scripts/test-pkg | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index 11ec18c..a1d272a 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -73,7 +73,7 @@ build_one() {
local url="${2}"
local cfg="${3}"
local pkg="${4}"
- local toolchain line skip
+ local toolchain
# Using basename(1) on a URL works nicely
toolchain="$(basename "${url}" .config)"
@@ -106,14 +106,10 @@ build_one() {
# or not set) in the actual .config; if one of them is not, it means
# some dependency from the toolchain or arch is not available, in
# which case this config is untestable and we skip it.
- skip=false
- while read line; do
- if ! grep "^${line}\$" "${dir}/.config" >/dev/null 2>&1; then
- printf "%s\n" "${line}"
- skip=true
- fi
- done <"${cfg}" >"${dir}/missing.config"
- if ${skip}; then
+ # We don't care about the locale to sort in, as long as both sort are
+ # done in the same locale.
+ comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config"
+ if [ -s "${dir}/missing.config" ]; then
printf ", SKIPPED\n"
return
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 3/7 v4] support/test-pkg: simplify the config check
2017-02-12 14:53 ` [Buildroot] [PATCH 3/7 v4] support/test-pkg: simplify the config check Yann E. MORIN
@ 2017-02-12 15:02 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2017-02-12 15:02 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 Feb 2017 15:53:07 +0100, Yann E. MORIN wrote:
> Use comm(1) to check that all our config options are properly set in the
> resulting configuration, rather than our canned and fragile code.
>
> Reported-by: Cam Hutchison <camh@xdna.net>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> support/scripts/test-pkg | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/7 v4] support/test-pkg: be less verbose
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
` (2 preceding siblings ...)
2017-02-12 14:53 ` [Buildroot] [PATCH 3/7 v4] support/test-pkg: simplify the config check Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 15:02 ` Thomas Petazzoni
2017-02-12 14:53 ` [Buildroot] [PATCH 5/7 v4] support/test-pkg: report number and types of failures Yann E. MORIN
` (2 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Requested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
support/scripts/test-pkg | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index a1d272a..d9ae5c5 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -83,9 +83,8 @@ build_one() {
dir="${dir}/${toolchain}"
mkdir -p "${dir}"
- printf "download config"
if ! curl -s "${url}" >"${dir}/.config"; then
- printf ": FAILED\n"
+ printf "FAILED\n"
return
fi
@@ -97,9 +96,8 @@ build_one() {
_EOF_
cat "${cfg}" >>"${dir}/.config"
- printf ", olddefconfig"
if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then
- printf ": FAILED\n"
+ printf "FAILED\n"
return
fi
# We want all the options from the snippet to be present as-is (set
@@ -110,28 +108,26 @@ build_one() {
# done in the same locale.
comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config"
if [ -s "${dir}/missing.config" ]; then
- printf ", SKIPPED\n"
+ printf "SKIPPED\n"
return
fi
# Remove file, it's empty anyway.
rm -f "${dir}/missing.config"
if [ -n "${pkg}" ]; then
- printf ", dirclean"
if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then
- printf ": FAILED\n"
+ printf "FAILED\n"
return
fi
fi
- printf ", build"
# shellcheck disable=SC2086
if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then
- printf ": FAILED\n"
+ printf "FAILED\n"
return
fi
- printf ": OK\n"
+ printf "OK\n"
}
help() {
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 4/7 v4] support/test-pkg: be less verbose
2017-02-12 14:53 ` [Buildroot] [PATCH 4/7 v4] support/test-pkg: be less verbose Yann E. MORIN
@ 2017-02-12 15:02 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2017-02-12 15:02 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 Feb 2017 15:53:08 +0100, Yann E. MORIN wrote:
> Requested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> support/scripts/test-pkg | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 5/7 v4] support/test-pkg: report number and types of failures
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
` (3 preceding siblings ...)
2017-02-12 14:53 ` [Buildroot] [PATCH 4/7 v4] support/test-pkg: be less verbose Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 15:02 ` Thomas Petazzoni
2017-02-12 14:53 ` [Buildroot] [PATCH 6/7 v4] support/test-pkg: add option to use an alternate list of toolchains Yann E. MORIN
2017-02-12 14:53 ` [Buildroot] [PATCH 7/7 v4] support/test-pkg: print number of toolchain and progress Yann E. MORIN
6 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
---
support/scripts/test-pkg | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index d9ae5c5..a040ce1 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -6,6 +6,7 @@ TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-conf
main() {
local o O opts
local cfg dir pkg random toolchain
+ local ret nb nb_skip nb_fail
local -a toolchains
o='hc:d:p:r:'
@@ -63,9 +64,20 @@ main() {
printf "error: no toolchain found (networking issue?)\n" >&2; exit 1
fi
+ nb=0
+ nb_skip=0
+ nb_fail=0
for toolchain in "${toolchains[@]}"; do
- build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}"
+ build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" && ret=0 || ret=${?}
+ case ${ret} in
+ (0) ;;
+ (1) : $((nb_skip++));;
+ (2) : $((nb_fail++));;
+ esac
+ : $((nb++))
done
+
+ printf "%d builds, %d skipped, %d failed\n" ${nb} ${nb_skip} ${nb_fail}
}
build_one() {
@@ -85,7 +97,7 @@ build_one() {
if ! curl -s "${url}" >"${dir}/.config"; then
printf "FAILED\n"
- return
+ return 2
fi
cat >>"${dir}/.config" <<-_EOF_
@@ -98,7 +110,7 @@ build_one() {
if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then
printf "FAILED\n"
- return
+ return 2
fi
# We want all the options from the snippet to be present as-is (set
# or not set) in the actual .config; if one of them is not, it means
@@ -109,7 +121,7 @@ build_one() {
comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config"
if [ -s "${dir}/missing.config" ]; then
printf "SKIPPED\n"
- return
+ return 1
fi
# Remove file, it's empty anyway.
rm -f "${dir}/missing.config"
@@ -117,14 +129,14 @@ build_one() {
if [ -n "${pkg}" ]; then
if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then
printf "FAILED\n"
- return
+ return 2
fi
fi
# shellcheck disable=SC2086
if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then
printf "FAILED\n"
- return
+ return 2
fi
printf "OK\n"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 5/7 v4] support/test-pkg: report number and types of failures
2017-02-12 14:53 ` [Buildroot] [PATCH 5/7 v4] support/test-pkg: report number and types of failures Yann E. MORIN
@ 2017-02-12 15:02 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2017-02-12 15:02 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 Feb 2017 15:53:09 +0100, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Luca Ceresoli <luca@lucaceresoli.net>
> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
> ---
> support/scripts/test-pkg | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 6/7 v4] support/test-pkg: add option to use an alternate list of toolchains
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
` (4 preceding siblings ...)
2017-02-12 14:53 ` [Buildroot] [PATCH 5/7 v4] support/test-pkg: report number and types of failures Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
2017-02-12 14:53 ` [Buildroot] [PATCH 7/7 v4] support/test-pkg: print number of toolchain and progress Yann E. MORIN
6 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
For now, testing a package requires network access. However, there are
situations where everything is already cached locally (especially the
toolchains tarballs) and network is not available (e.g. in the train,
travelling back from FOSDEM...)
Alternatively, one may also want to test against a subset of the default
toolchains (e.g. the ones known to have a specific issue).
Add an option to use an alternate URL, which can be remote or a path to
a local file.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
support/scripts/test-pkg | 47 +++++++++++++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index a040ce1..9626c1a 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -5,16 +5,17 @@ TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-conf
main() {
local o O opts
- local cfg dir pkg random toolchain
+ local cfg dir pkg random url toolchain
local ret nb nb_skip nb_fail
local -a toolchains
- o='hc:d:p:r:'
- O='help,config-snippet:build-dir:package:,random:'
+ o='hc:d:p:r:t:'
+ O='help,config-snippet:build-dir:package:,random:,toolchains:'
opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")"
eval set -- "${opts}"
random=0
+ url="${TOOLCHAINS_URL}"
while [ ${#} -gt 0 ]; do
case "${1}" in
(-h|--help)
@@ -32,6 +33,9 @@ main() {
(-r|--random)
random="${2}"; shift 2
;;
+ (-t|--toolchains)
+ url="${2}"; shift 2
+ ;;
(--)
shift; break
;;
@@ -47,10 +51,16 @@ main() {
dir="${HOME}/br-test-pkg"
fi
+ # Transform local paths to URI to make curl happy and simplify
+ # our code path
+ case "${url}" in
+ (/*) url="file://${url}";;
+ esac
+
# 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}" \
+ toolchains=($(curl -s "${url}" \
|sed -r -e 's/,.*//; /internal/d;' \
|if [ ${random} -gt 0 ]; then \
sort -R |head -n ${random}
@@ -87,6 +97,12 @@ build_one() {
local pkg="${4}"
local toolchain
+ # Transform local paths to URI to make curl happy and simplify
+ # our code path
+ case "${url}" in
+ (/*) url="file://${url}";;
+ esac
+
# Using basename(1) on a URL works nicely
toolchain="$(basename "${url}" .config)"
@@ -156,8 +172,22 @@ In case failures are noticed, you can fix the package and just re-run the
same command again; it will re-run the test where it failed. If you did
specify a package (with -p), the package build dir will be removed first.
-The list of toolchains is retrieved from the Buildroot autobuilders, available
-at ${TOOLCHAINS_URL}.
+Unless specified with -t, the list of toolchains is retrieved from the
+Buildroot autobuilders, available at:
+ ${TOOLCHAINS_URL}
+
+The list of toolchains should contain the URLs to all toolchains, one per
+line, along with the architecture and C library used, separated by commas,
+"URL,ARCH,LIBC" (only the first field, URL, is used by this script). For
+example:
+
+ https://server/path/to/toolchain-1.config,arm,glibc
+ /path/to/local-toolchain.config,i386,musl
+
+The URL for each toolchain should point to a .config file that contains
+only the toolchain and architecture settings. URLs that contain the string
+'internal' are skipped, on the assumption that the configuration would
+build an internal toolchain (which takes a lot of time).
Options:
@@ -179,6 +209,11 @@ Options:
Limit the tests to the N randomly selected toolchains, instead of
building with all toolchains.
+ -t URL, --toolchains URL
+ Use the toolchains described at URL instead of the toolchains used
+ by the Buildroot autobuilders (see above). URL can be a path to a
+ local file.
+
Example:
Testing libcec would require a config snippet that contains:
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 7/7 v4] support/test-pkg: print number of toolchain and progress
2017-02-12 14:53 [Buildroot] [PATCH 0/7 v4] support/test-pkg: fixes and enhancements Yann E. MORIN
` (5 preceding siblings ...)
2017-02-12 14:53 ` [Buildroot] [PATCH 6/7 v4] support/test-pkg: add option to use an alternate list of toolchains Yann E. MORIN
@ 2017-02-12 14:53 ` Yann E. MORIN
6 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2017-02-12 14:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
---
support/scripts/test-pkg | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index 9626c1a..8d47415 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -6,7 +6,7 @@ TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-conf
main() {
local o O opts
local cfg dir pkg random url toolchain
- local ret nb nb_skip nb_fail
+ local ret nb nb_skip nb_fail nb_tc
local -a toolchains
o='hc:d:p:r:t:'
@@ -70,21 +70,25 @@ main() {
)
)
- if [ ${#toolchains[@]} -eq 0 ]; then
+ nb_tc="${#toolchains[@]}"
+ if [ ${nb_tc} -eq 0 ]; then
printf "error: no toolchain found (networking issue?)\n" >&2; exit 1
fi
+ printf "Found %d toolchains\n" ${nb_tc}
nb=0
nb_skip=0
nb_fail=0
for toolchain in "${toolchains[@]}"; do
+ : $((nb++))
+ printf "%40s [%*d/%d]: " "$(basename "${toolchain}" .config)" \
+ ${#nb_tc} ${nb} ${nb_tc}
build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" && ret=0 || ret=${?}
case ${ret} in
- (0) ;;
- (1) : $((nb_skip++));;
- (2) : $((nb_fail++));;
+ (0) printf "OK\n";;
+ (1) : $((nb_skip++)); printf "SKIPPED\n";;
+ (2) : $((nb_fail++)); printf "FAILED\n";;
esac
- : $((nb++))
done
printf "%d builds, %d skipped, %d failed\n" ${nb} ${nb_skip} ${nb_fail}
@@ -106,13 +110,10 @@ build_one() {
# Using basename(1) on a URL works nicely
toolchain="$(basename "${url}" .config)"
- printf "%40s: " "${toolchain}"
-
dir="${dir}/${toolchain}"
mkdir -p "${dir}"
if ! curl -s "${url}" >"${dir}/.config"; then
- printf "FAILED\n"
return 2
fi
@@ -125,7 +126,6 @@ build_one() {
cat "${cfg}" >>"${dir}/.config"
if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then
- printf "FAILED\n"
return 2
fi
# We want all the options from the snippet to be present as-is (set
@@ -136,7 +136,6 @@ build_one() {
# done in the same locale.
comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config"
if [ -s "${dir}/missing.config" ]; then
- printf "SKIPPED\n"
return 1
fi
# Remove file, it's empty anyway.
@@ -144,18 +143,14 @@ build_one() {
if [ -n "${pkg}" ]; then
if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then
- printf "FAILED\n"
return 2
fi
fi
# shellcheck disable=SC2086
if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then
- printf "FAILED\n"
return 2
fi
-
- printf "OK\n"
}
help() {
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread