From fe3db542edf15990ad5a9aa2bd9fc9b722f1cf54 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 10 Dec 2017 15:37:18 -0500
Subject: [PATCH] Fix ERT not running properly on make test

---
 Makefile              | 2 +-
 core/autoload/test.el | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a53dc66e3..937fbd275 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ test-core $(patsubst %, test-%, $(MODULES)): init.el .local/autoloads.el
 
 # run tests interactively
 testi: init.el .local/autoloads.el
-	@$(EMACSI) -f doom//run-tests -f ert
+	@$(EMACSI) -f doom//run-tests
 
 
 ## Utility tasks
diff --git a/core/autoload/test.el b/core/autoload/test.el
index 01daf16cc..60669a57e 100644
--- a/core/autoload/test.el
+++ b/core/autoload/test.el
@@ -60,9 +60,9 @@ If neither is available, run all tests in all enabled modules."
                   into items
                  finally do (quiet! (mapc #'load-file items)))
         ;; run all loaded tests
-        (when noninteractive
-          (let (noninteractive)
-            (ert-run-tests-batch-and-exit))))
+        (if noninteractive
+            (ert-run-tests-batch-and-exit)
+          (call-interactively #'ert-run-tests-interactively)))
     ('error
      (lwarn 'doom-test :error
             "%s -> %s"