Hi Nicolas,

On Wed, Oct 11, 2023 at 10:58:22PM +0200, Nicolas Boulenguez wrote:
> > honestly the whole link script looks like a hack to me, I prefer the
> > way it was before.
> 
> I agree that an executable debian/libghdl-dev.links is a last resort,
> but a reader discovering the package does not need to [...].

Well at least the new version has more docs and works, I'll take it. Let's
see if Andreas just reverts it or not ;)

More comments inline below.

> Subject: [PATCH 07/14] Delegate computation of Built-Using to dh-builtusing

This breaks the build for me since I build the source package on bookworm
(via gbp). I might hold off on this one until dh-builtusing is backported.

> From caf2fa626289a1850da5d0c46431b009f30c793c Mon Sep 17 00:00:00 2001
> From: Nicolas Boulenguez <nico...@debian.org>
> Date: Thu, 5 Oct 2023 14:39:35 +0200
> Subject: [PATCH 12/14] Various minor improvements in the test driver
> 
> Enable more alerts by the shell.
> 
> Check the argument count.
> 
> Replace test cascades with 'case' constructs.
> 
> There is no need to create RUNDIR because the script is called after a
> 'make install'.
> 
> There is no need to check that the RUNDIR variable is not empty, it is
> set in all branches of the previous construct.
> ---
>  debian/tests/ghdl-tests | 34 +++++++++++++++-------------------
>  1 file changed, 15 insertions(+), 19 deletions(-)
> 
> diff --git a/debian/tests/ghdl-tests b/debian/tests/ghdl-tests
> index 5868e16c..871d594b 100755
> --- a/debian/tests/ghdl-tests
> +++ b/debian/tests/ghdl-tests
> @@ -1,39 +1,35 @@
>  #!/bin/sh
>  
> -set -e
> +set -C -e -f -u
>  
>  # The pyunit tests are not run here. These parts are not activated in
>  # Debian yet.
>  TESTS="sanity gna vests synth vpi vhpi"
>  
> +test $# = 2

This is kind of obscure, think of the (lack of an) error message. If we
skip this we'll get an "undefined $2" error due to set -u, which I find is
more helpful than a quiet exit rv>0.

> -if [ "$2" = mcode ]; then
> -     BACKEND=mcode
> -elif [ "$2" = llvm ]; then
> -     BACKEND=llvm
> -elif [ "$2" = gcc ]; then
> -     BACKEND=gcc
> -else
> +case "$2" in
> +    gcc|llvm|mcode)
> +     BACKEND=$2
> +     ;;
> +    *)
>       echo >&2 "Invalid backend specification"
>       exit 1
> -fi
> +esac
>  
> -if [ "$1" = buildtest ]; then
> +case "$1" in
> +    buildtest)
>       RUNDIR=testrundir/$BACKEND
> -     mkdir -p "$RUNDIR"
>       GHDL="$PWD/$RUNDIR/usr/bin/ghdl-$BACKEND"
> -elif [ "$1" = autopkgtest ]; then
> +     ;;
> +    autopkgtest)
>       RUNDIR="$AUTOPKGTEST_TMP"
>       GHDL=/usr/bin/ghdl-$BACKEND
> -else
> +     ;;
> +    *)
>       echo >&2 "Invalid test environment specification"
>       exit 1
> -fi
> -
> -if [ -z "$RUNDIR" ]; then
> -     echo >&2 "RUNDIR is empty string"
> -     exit 1
> -fi
> +esac
>  
>  # Copy testsuite into $RUNDIR to execute there, so that no cleanup is 
> necessary
>  # (entire $RUNDIR will be deleted later). Also copy src/grt as at least one 
> test
> -- 
> 2.39.2

--Daniel

Attachment: signature.asc
Description: PGP signature

Reply via email to