ci-windows: remove (provide 'windows-boostrap) and cleanup after test (#2163)

Author: kiennq

Makefile

@@ -83,6 +83,7 @@ unix-test:
 
 windows-test:
 	@$(EMACS) -Q --batch \
+		-l test/windows-bootstrap.el \
 		-L . -L clients \
 		$(LOAD-TEST-FILES) \
 		--eval "(ert-run-tests-batch-and-exit \

test/windows-bootstrap.el

@@ -23,13 +23,24 @@
 
 (require 'package)
 
-(let* ((pkgs '(dash dash-functional f lv ht spinner markdown-mode deferred ert-runner)))
-  (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
+
+(setq user-emacs-directory (expand-file-name (make-temp-name ".emacs.d")
+                                             "~")
+      package-user-dir (expand-file-name (make-temp-name "tmp-elpa")
+                                         user-emacs-directory))
+
+(let* ((package-archives '(("melpa" . "https://melpa.org/packages/")
+                           ("gnu" . "https://elpa.gnu.org/packages/")))
+       (pkgs '(dash dash-functional f lv ht spinner markdown-mode deferred)))
   (package-initialize)
+  (package-refresh-contents)
+
+  (mapc (lambda (pkg)
+          (unless (package-installed-p pkg)
+            (package-install pkg)))
+        pkgs)
 
-  (when (cl-find-if-not 'package-installed-p pkgs)
-    (package-refresh-contents)
-    (mapc 'package-install pkgs)))
+  (add-hook 'kill-emacs-hook
+            `(lambda () (delete-directory ,user-emacs-directory t))))
 
-(provide 'windows-bootstrap)
 ;;; windows-bootstrap.el ends here