Game of Trees Repos

Commit Diff

Commit:: 5a7ef102e32811458b2bdf94bf772cc692504511
From:: Thomas Adam <thomas@xteddy.org>
Date:: Sat Oct 9 00:05:57 2021 UTC
Message:: regress: enable tests Enable the compilation and execution of the tests under regress/
Actions:: Patch | Tree
commit - 0ca5b679a408be58a7330776fdb1a4748ca7a9bd
commit + 5a7ef102e32811458b2bdf94bf772cc692504511
blob - 26a79f2d8ee0b6894c5181832f3fd4850d89de29
blob + 9aefb4e9b083087dafd77fa73d1c85617984a001
--- .gitignore
+++ .gitignore
@@ -36,5 +36,10 @@ libexec/got-read-pack/got-read-pack
 libexec/got-read-tag/got-read-tag
 libexec/got-read-tree/got-read-tree
 libexec/got-send-pack/got-send-pack
+regress/delta/delta_test
+regress/deltify/deltify_test
+regress/fetch/fetch_test
+regress/idset/idset_test
+regress/path/path_test
 tags
 tog/tog
blob - fa47506aea539b04738688df171df55668af4f29
blob + 37117928ea5a4956997393d7d7c927887afbcc59
--- Makefile.am
+++ Makefile.am
@@ -5,6 +5,119 @@ include $(top_builddir)/Makefile.common
 EXTRA_DIST = CHANGES CHANGELOG
 
 LDADD = $(LIBOBJS)
+if HOST_FREEBSD
+LDADD += -lmd
+LIBS += -lmd
+endif
 
-tests:
-	$(MAKE) -C regress/cmdline -f Makefile.linux
+TEST_TARGETS=regress-delta regress-deltify regress-fetch regress-idset \
+	     regress-path regress-cmdline
+GOT_TEST_ROOT=/tmp
+
+tests: $(TEST_TARGETS)
+
+regress-cmdline:
+	(cd $(top_builddir)/regress/cmdline || exit $$?; 	\
+	./checkout.sh -r "$(GOT_TEST_ROOT)";			\
+	./update.sh -r "$(GOT_TEST_ROOT)";			\
+	./status.sh -r "$(GOT_TEST_ROOT)";			\
+	./log.sh -r "$(GOT_TEST_ROOT)";				\
+	./add.sh -r "$(GOT_TEST_ROOT)";				\
+	./rm.sh -r "$(GOT_TEST_ROOT)";				\
+	./diff.sh -r "$(GOT_TEST_ROOT)";			\
+	./blame.sh -r "$(GOT_TEST_ROOT)";			\
+	./branch.sh -r "$(GOT_TEST_ROOT)";			\
+	./tag.sh -r "$(GOT_TEST_ROOT)";				\
+	./ref.sh -r "$(GOT_TEST_ROOT)";				\
+	./commit.sh -r "$(GOT_TEST_ROOT)";			\
+	./revert.sh -r "$(GOT_TEST_ROOT)";			\
+	./cherrypick.sh -r "$(GOT_TEST_ROOT)";			\
+	./backout.sh -r "$(GOT_TEST_ROOT)";			\
+	./rebase.sh -r "$(GOT_TEST_ROOT)";			\
+	./import.sh -r "$(GOT_TEST_ROOT)";			\
+	./histedit.sh -r "$(GOT_TEST_ROOT)";			\
+	./integrate.sh -r "$(GOT_TEST_ROOT)";			\
+	./stage.sh -r "$(GOT_TEST_ROOT)";			\
+	./unstage.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./cat.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./clone.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./fetch.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./send.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./tree.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./pack.sh -r "$(GOT_TEST_ROOT)"; 			\
+	./cleanup.sh -r "$(GOT_TEST_ROOT)")
+
+regress-delta:
+	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
+		-o $(top_builddir)/regress/delta/delta_test \
+		$(top_srcdir)/lib/delta.c \
+		$(top_srcdir)/lib/error.c \
+		$(top_srcdir)/lib/opentemp.c \
+		$(top_srcdir)/lib/path.c \
+		$(top_srcdir)/lib/inflate.c \
+		$(top_srcdir)/lib/sha1.c \
+		$(top_srcdir)/regress/delta/delta_test.c \
+		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
+			$(top_builddir)/regress/delta/delta_test
+
+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/deltify.c \
+		$(top_srcdir)/lib/error.c \
+		$(top_srcdir)/lib/opentemp.c \
+		$(top_srcdir)/lib/sha1.c \
+		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
+			$(top_builddir)/regress/deltify/deltify_test
+
+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/pack.c \
+		$(top_srcdir)/lib/inflate.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/object_create.c \
+		$(top_srcdir)/lib/fetch.c \
+		$(top_srcdir)/lib/gotconfig.c \
+		$(top_srcdir)/lib/dial.c \
+		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
+			$(top_builddir)/regress/fetch/fetch_test
+
+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/error.c \
+		$(top_srcdir)/lib/sha1.c \
+		$(top_srcdir)/lib/object_idset.c \
+		$(top_srcdir)/lib/inflate.c \
+		$(top_srcdir)/lib/path.c \
+		$(top_srcdir)/lib/object_parse.c \
+		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
+			$(top_builddir)/regress/idset/idset_test
+
+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/error.c \
+		$(top_srcdir)/lib/sha1.c \
+		$(top_srcdir)/lib/path.c \
+		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
+			$(top_builddir)/regress/path/path_test
blob - 857e0e23d5392ef0f579ad2e436f82e46e786f79
blob + bc1369b098aa9b0b1ea23626a8d0ce7d2ca79b2c
--- configure.ac
+++ configure.ac
@@ -447,8 +447,7 @@ AC_CONFIG_FILES([Makefile
 		 got/Makefile
 		 gotadmin/Makefile
 		 tog/Makefile
-		 Makefile.common:Makefile.common.in
-		 regress/cmdline/Makefile.linux:regress/cmdline/Makefile.am])
+		 Makefile.common:Makefile.common.in])
 AC_OUTPUT
 
 #                tog/GNUMakefile])
blob - 872d88379087aa49d66ebbc780ae19c92d4637e9
blob + f8adfda66bf9019ece759fb48594500cc46ffa8d
--- regress/deltify/deltify_test.c
+++ regress/deltify/deltify_test.c
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
blob - 704d9aa3a0c64012553f250e3b775c3f6a243de2
blob + a9e4ce797d55e5000ac00da06faf04ba29ea2c18
--- regress/fetch/fetch_test.c
+++ regress/fetch/fetch_test.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <err.h>
-#include <sha1.h>
 #include <zlib.h>
 #include <time.h>
 
blob - e21dea5cf4e079df6f202da96e4df788c0664262
blob + 429beb1d097c7200262558eb58712cbbc04591b4
--- regress/idset/idset_test.c
+++ regress/idset/idset_test.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <err.h>
-#include <sha1.h>
 #include <zlib.h>
 #include <time.h>