Fix CI by relying less on Nix

The previous implementation kept breaking and we got no help fixing
that.  More or less go back to the previous implementation, which we
know how to keep running without any outside help.

Previously testing using libgit was disabled because it was broken,
while now there simply isn't any code to attempt to test that.

1 files changed, 0 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 8569e7c..12a5381 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,6 @@ help:
 	$(info ====)
 	$(info )
 	$(info make test             - run tests)
-	$(info make test-git         - run tests using Git functions)
-	$(info make test-libgit      - run tests using libgit functions)
 	$(info make test-interactive - run tests interactively)
 	$(info make emacs-Q          - run emacs -Q plus Magit)
 	$(info )
@@ -113,27 +111,6 @@ test:
 	(load-file \"t/magit-tests.el\")\
 	(ert-run-tests-batch-and-exit))"
 
-test-git:
-	@$(BATCH) --eval "(progn\
-        $$suppress_warnings\
-	(require 'magit)\
-	(setq magit-inhibit-libgit t)\
-	(unless (eq 'git (magit-gitimpl))\
-	  (message \"Git implementation not being used.\")\
-	  (kill-emacs 1))\
-	(load-file \"t/magit-tests.el\")\
-	(ert-run-tests-batch-and-exit))"
-
-test-libgit:
-	@$(BATCH) --eval "(progn\
-		$$suppress_warnings\
-	(require 'magit)\
-	(unless (eq 'libgit (magit-gitimpl))\
-	  (message \"libgit not available.\")\
-	  (kill-emacs 1))\
-	(load-file \"t/magit-tests.el\")\
-	(ert-run-tests-batch-and-exit))"
-
 test-interactive:
 	@$(EMACSBIN) -Q $(LOAD_PATH) --eval "(progn\
 	(load-file \"t/magit-tests.el\")\