commit 09e05ed50d7310833916e622c86ee1a18ba4a1b0 from: Thomas Adam date: Wed Mar 08 09:27:14 2023 UTC portable: regress: imply compat When building tests, compat needs to be built. Do this prior to running any tests. This ensures tests can be run from a clean tree. Furthermore, add got_compat.h to all test headers. This wasn't necessary before as this was implicitly being included, but now isn't. commit - 943e9ed21cb1949f950a6f921d59b438cb759ae2 commit + 09e05ed50d7310833916e622c86ee1a18ba4a1b0 blob - 7650199f7ca45b2ebcc439cd05c4523555eb643e blob + f7b80f50ce049f06adf9fe9a027ce67d0d02b0a0 --- Makefile.am +++ Makefile.am @@ -11,12 +11,17 @@ LDADD += -lmd LIBS += -lmd endif -LIBS += -lm +LIBS += -lm $(zlib_LIBS) $(libbsd_LIBS) +AM_CPPFLAGS += $(libbsd_CFLAGS) -TEST_TARGETS=regress-delta regress-deltify regress-fetch regress-idset \ +TEST_TARGETS=compat regress-delta regress-deltify regress-fetch regress-idset \ regress-path regress-cmdline GOT_TEST_ROOT=/tmp +.PHONY: compat +compat: + $(MAKE) -C compat + tests: $(TEST_TARGETS) regress-cmdline: blob - 377ea9cd19e22c07f1348e7110a49defd8cb974d blob + 34139b0709f8ad4c3fe739188efd615dee50f75e --- regress/delta/delta_test.c +++ regress/delta/delta_test.c @@ -14,6 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "got_compat.h" + #include #include blob - c523b0dab205514541bb504368a704c89c4c7019 blob + 9432d3cedf9a350c24fb459778f2d6288e10a862 --- regress/deltify/deltify_test.c +++ regress/deltify/deltify_test.c @@ -13,6 +13,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include "got_compat.h" #include #include blob - 644249ca63d93911e506cc4411f40c1836d527df blob + c82add83353bd6150b3f7ee182ed5696a1ece06f --- regress/fetch/fetch_test.c +++ regress/fetch/fetch_test.c @@ -13,6 +13,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include "got_compat.h" #include blob - 4c9b401d8ebeee2041343bc28f08b71d287a0f1d blob + 529d7ecc4770b7fb8547c6baeb5a13156cecb09a --- regress/idset/idset_test.c +++ regress/idset/idset_test.c @@ -14,6 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "got_compat.h" + #include #include blob - fad15574f54715f8f62105579fbc58c1ca5d1bf1 blob + dc1cab6731623d765cc9bf2620c58cbb094dc890 --- regress/path/path_test.c +++ regress/path/path_test.c @@ -14,6 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "got_compat.h" + #include #include