On Sat, Feb 04, 2023 at 08:12:58PM +0100, Omar Polo wrote:
> On 2023/02/04 20:08:53 +0100, stsp@stsp.name wrote:
> > [...]
> > ===> regress/delta
> > [...]
> > ld: error: undefined symbol: got_object_id_hex
> > >>> referenced by error.c:374 (/home/stsp/got/regress/delta/../../lib/error.c:374)
> > >>>               error.o:(got_error_no_obj)
> > >>> referenced by error.c:391 (/home/stsp/got/regress/delta/../../lib/error.c:391)
> > >>>               error.o:(got_error_checksum)
> > cc: error: linker command failed with exit code 1 (use -v to see invocation)
> > *** Error 1 in regress/delta (<bsd.prog.mk>:126 'delta_test')
> > *** Error 2 in regress (<bsd.subdir.mk>:48 'all': @for entry in cmdline delta deltify idset path fetch; do  set -e; if test -d /home/stsp/go...)
> > *** Error 2 in /home/stsp/got (<bsd.subdir.mk>:62 'regress': @set -e; if test -d /home/stsp/got/regress.arm64; then  _newdir_=regress.arm64;...)
> 
> Ooops, I was just testing regress/cmdline recently and forgot about
> these tests.  Thanks Stefan and Tracey to run these tests :)
> 
> The quick fix would be to add the missing files to the build (diff
> below), or to move got_object_id_hex to a file with less dependencies.

This quick fix is fine. ok

> 
> diff /home/op/w/got
> commit - f219fe1c1a343d1d239a21a93b79fb41ab0b2dd5
> path + /home/op/w/got
> blob - ed3e1ede4a34e7f539a89738ca6f2d6b40947627
> file + regress/delta/Makefile
> --- regress/delta/Makefile
> +++ regress/delta/Makefile
> @@ -1,7 +1,8 @@
>  .PATH:${.CURDIR}/../../lib
>  
>  PROG = delta_test
> -SRCS = delta.c error.c opentemp.c path.c inflate.c sha1.c delta_test.c pollfd.c
> +SRCS = delta.c error.c opentemp.c path.c inflate.c sha1.c delta_test.c \
> +	pollfd.c object_parse.c
>  
>  CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
>  LDADD = -lz
> blob - 3685d581c00c312631e3fc1877509c48999690d4
> file + regress/deltify/Makefile
> --- regress/deltify/Makefile
> +++ regress/deltify/Makefile
> @@ -1,7 +1,8 @@
>  .PATH:${.CURDIR}/../../lib
>  
>  PROG = deltify_test
> -SRCS = deltify.c error.c opentemp.c sha1.c deltify_test.c murmurhash2.c
> +SRCS = deltify.c error.c opentemp.c sha1.c deltify_test.c murmurhash2.c \
> +	object_parse.c inflate.c path.c pollfd.c
>  
>  CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
>  LDADD = -lz
> blob - 2ea8b5866c6983923940261d1e513e73e8ebdb41
> file + regress/path/Makefile
> --- regress/path/Makefile
> +++ regress/path/Makefile
> @@ -1,7 +1,7 @@
>  .PATH:${.CURDIR}/../../lib
>  
>  PROG = path_test
> -SRCS = error.c path.c sha1.c path_test.c
> +SRCS = error.c path.c sha1.c path_test.c object_parse.c inflate.c pollfd.c
>  
>  CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
>  LDADD = -lutil -lz
>