commit cb3c9f1cc3c0150fe2781c4bcd4bcae557696705 from: Thomas Adam date: Thu Oct 13 21:08:00 2022 UTC portable: regress: order lib files For those tests which rely on compilation files, order them alphabetically so it's easier when having to change the makefile stanzas. commit - c59427c506d2ef9128e705a75134bb3a3b4d2848 commit + cb3c9f1cc3c0150fe2781c4bcd4bcae557696705 blob - 6acb5d4f05e147393331235098ed9b0bf553f881 blob + 55cd0e01e582df3cd796d48180a54829a4caf9dc --- Makefile.am +++ Makefile.am @@ -10,6 +10,8 @@ LDADD += -lmd LIBS += -lmd endif +LIBS += -lm + TEST_TARGETS=regress-delta regress-deltify regress-fetch regress-idset \ regress-path regress-cmdline GOT_TEST_ROOT=/tmp @@ -53,15 +55,34 @@ regress-cmdline: regress-delta: $(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \ -o $(top_builddir)/regress/delta/delta_test \ + $(top_srcdir)/lib/murmurhash2.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/date.c \ + $(top_srcdir)/lib/deflate.c \ $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/gotconfig.c \ $(top_srcdir)/lib/opentemp.c \ $(top_srcdir)/lib/path.c \ $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/sha1.c \ + $(top_srcdir)/lib/object.c \ + $(top_srcdir)/lib/object_cache.c \ + $(top_srcdir)/lib/object_create.c \ + $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_open_privsep.c \ - $(top_srcdir)/regress/delta/delta_test.c \ + $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/privsep.c \ + $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/repository.c \ + $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ + $(top_srcdir)/lib/sigs.c \ + $(top_srcdir)/regress/delta/delta_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ $(top_builddir)/regress/delta/delta_test @@ -69,14 +90,34 @@ regress-deltify: $(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \ -o $(top_builddir)/regress/deltify/deltify_test \ $(top_srcdir)/regress/deltify/deltify_test.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/date.c \ + $(top_srcdir)/lib/deflate.c \ + $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ $(top_srcdir)/lib/deltify.c \ $(top_srcdir)/lib/error.c \ - $(top_srcdir)/lib/opentemp.c \ - $(top_srcdir)/lib/sha1.c \ + $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ + $(top_srcdir)/lib/object.c \ + $(top_srcdir)/lib/object_cache.c \ + $(top_srcdir)/lib/object_create.c \ + $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_open_privsep.c \ - $(top_srcdir)/lib/read_gitconfig_privsep.c \ + $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/opentemp.c \ + $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ + $(top_srcdir)/lib/read_gitconfig_privsep.c \ + $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/repository.c \ + $(top_srcdir)/lib/sha1.c \ + $(top_srcdir)/lib/sigs.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ $(top_builddir)/regress/deltify/deltify_test @@ -84,36 +125,36 @@ regress-fetch: $(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \ -o $(top_builddir)/regress/fetch/fetch_test \ $(top_srcdir)/regress/fetch/fetch_test.c \ - $(top_srcdir)/lib/error.c \ - $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/reference.c \ - $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/object.c \ - $(top_srcdir)/lib/object_parse.c \ - $(top_srcdir)/lib/path.c \ - $(top_srcdir)/lib/opentemp.c \ - $(top_srcdir)/lib/repository.c \ - $(top_srcdir)/lib/lockfile.c \ - $(top_srcdir)/lib/object_cache.c \ - $(top_srcdir)/lib/object_open_privsep.c \ - $(top_srcdir)/lib/pack.c \ - $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/date.c \ $(top_srcdir)/lib/deflate.c \ $(top_srcdir)/lib/delta.c \ $(top_srcdir)/lib/delta_cache.c \ - $(top_srcdir)/lib/object_idset.c \ + $(top_srcdir)/lib/deltify.c \ + $(top_srcdir)/lib/dial.c \ + $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/fetch.c \ + $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/lockfile.c \ + $(top_srcdir)/lib/murmurhash2.c \ + $(top_srcdir)/lib/object.c \ + $(top_srcdir)/lib/object_cache.c \ $(top_srcdir)/lib/object_create.c \ + $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_open_privsep.c \ + $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/opentemp.c \ + $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ - $(top_srcdir)/lib/fetch.c \ - $(top_srcdir)/lib/gotconfig.c \ - $(top_srcdir)/lib/dial.c \ - $(top_srcdir)/lib/bloom.c \ - $(top_srcdir)/lib/murmurhash2.c \ - $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/repository.c \ + $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ - $(top_srcdir)/lib/date.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) -lm && \ $(top_builddir)/regress/fetch/fetch_test @@ -121,14 +162,36 @@ regress-idset: $(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \ -o $(top_builddir)/regress/idset/idset_test \ $(top_srcdir)/regress/idset/idset_test.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/date.c \ + $(top_srcdir)/lib/deflate.c \ + $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ + $(top_srcdir)/lib/deltify.c \ + $(top_srcdir)/lib/dial.c \ $(top_srcdir)/lib/error.c \ - $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/object_idset.c \ + $(top_srcdir)/lib/fetch.c \ + $(top_srcdir)/lib/gotconfig.c \ $(top_srcdir)/lib/inflate.c \ - $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/lockfile.c \ + $(top_srcdir)/lib/murmurhash2.c \ + $(top_srcdir)/lib/object.c \ + $(top_srcdir)/lib/object_cache.c \ + $(top_srcdir)/lib/object_create.c \ + $(top_srcdir)/lib/object_idset.c \ + $(top_srcdir)/lib/object_open_privsep.c \ $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/opentemp.c \ + $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ + $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/repository.c \ + $(top_srcdir)/lib/sha1.c \ + $(top_srcdir)/lib/sigs.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ $(top_builddir)/regress/idset/idset_test @@ -136,11 +199,35 @@ regress-path: $(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \ -o $(top_builddir)/regress/path/path_test \ $(top_srcdir)/regress/path/path_test.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ + $(top_srcdir)/lib/date.c \ + $(top_srcdir)/lib/deflate.c \ + $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ + $(top_srcdir)/lib/deltify.c \ + $(top_srcdir)/lib/dial.c \ $(top_srcdir)/lib/error.c \ - $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/fetch.c \ + $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/lockfile.c \ + $(top_srcdir)/lib/murmurhash2.c \ + $(top_srcdir)/lib/object.c \ + $(top_srcdir)/lib/object_cache.c \ + $(top_srcdir)/lib/object_create.c \ + $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_open_privsep.c \ + $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/opentemp.c \ + $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ + $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/repository.c \ + $(top_srcdir)/lib/sha1.c \ + $(top_srcdir)/lib/sigs.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ $(top_builddir)/regress/path/path_test