diff mbox series

[kteam-tools] cranky-test-build: Determine the list of supported arches from the ABI

Message ID 20180615074629.14971-1-juergh@canonical.com
State New
Headers show
Series [kteam-tools] cranky-test-build: Determine the list of supported arches from the ABI | expand

Commit Message

Juerg Haefliger June 15, 2018, 7:46 a.m. UTC
debian.master/config/ might contain stale configs for arches that are
no longer (or not yet) supported. So query the ABI directory instead
which contains the truly supported arches.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 cranky/cranky-test-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Kleber Sacilotto de Souza June 15, 2018, 8:50 a.m. UTC | #1
On 06/15/18 09:46, Juerg Haefliger wrote:
> debian.master/config/ might contain stale configs for arches that are
> no longer (or not yet) supported. So query the ABI directory instead
> which contains the truly supported arches.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  cranky/cranky-test-build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/cranky/cranky-test-build b/cranky/cranky-test-build
> index 64d699c36680..1c9f41625ebb 100755
> --- a/cranky/cranky-test-build
> +++ b/cranky/cranky-test-build
> @@ -164,7 +164,9 @@ if [ "${series}" = "UNRELEASED" ] ; then
>  fi
>  
>  # Get the list of supported architectures
> -readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/config/" | \
> +abi=$(git ls-tree "${commit}" "${debian_d}/abi/" | grep ' tree ' | \
> +		  sed -e 's,.*/,,')
> +readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/abi/${abi}/" | \
>  								grep ' tree ' | sed -e 's,.*/,,')
>

The change works fine, but we could use the '-d' flag on ls-tree and
remove the two "grep ' tree '" and make it simpler.


Thanks,
Kleber
Juerg Haefliger June 15, 2018, 9:37 a.m. UTC | #2
On 06/15/2018 10:50 AM, Kleber Souza wrote:
> On 06/15/18 09:46, Juerg Haefliger wrote:
>> debian.master/config/ might contain stale configs for arches that are
>> no longer (or not yet) supported. So query the ABI directory instead
>> which contains the truly supported arches.
>>
>> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
>> ---
>>  cranky/cranky-test-build | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/cranky/cranky-test-build b/cranky/cranky-test-build
>> index 64d699c36680..1c9f41625ebb 100755
>> --- a/cranky/cranky-test-build
>> +++ b/cranky/cranky-test-build
>> @@ -164,7 +164,9 @@ if [ "${series}" = "UNRELEASED" ] ; then
>>  fi
>>  
>>  # Get the list of supported architectures
>> -readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/config/" | \
>> +abi=$(git ls-tree "${commit}" "${debian_d}/abi/" | grep ' tree ' | \
>> +		  sed -e 's,.*/,,')
>> +readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/abi/${abi}/" | \
>>  								grep ' tree ' | sed -e 's,.*/,,')
>>
> 
> The change works fine, but we could use the '-d' flag on ls-tree and
> remove the two "grep ' tree '" and make it simpler.

Uh, nice! Pushed :-)

...Juerg


> 
> Thanks,
> Kleber
>
diff mbox series

Patch

diff --git a/cranky/cranky-test-build b/cranky/cranky-test-build
index 64d699c36680..1c9f41625ebb 100755
--- a/cranky/cranky-test-build
+++ b/cranky/cranky-test-build
@@ -164,7 +164,9 @@  if [ "${series}" = "UNRELEASED" ] ; then
 fi
 
 # Get the list of supported architectures
-readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/config/" | \
+abi=$(git ls-tree "${commit}" "${debian_d}/abi/" | grep ' tree ' | \
+		  sed -e 's,.*/,,')
+readarray -t all_arches < <(git ls-tree "${commit}" "${debian_d}/abi/${abi}/" | \
 								grep ' tree ' | sed -e 's,.*/,,')
 
 if [ "${arches[0]}" = "all" ] ; then