[elpa] externals/csharp-mode 5bda548a4d 1/2: Fix issue with loading tests modifying Emacs setup.

[ELPA Syncer]

branch: externals/csharp-mode
commit 5bda548a4d0df1cbee55abba3e8731d8fcd6c360
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    Fix issue with loading tests modifying Emacs setup.
---
 csharp-mode-tests.el | 33 +++++++++++++++++----------------
 makefile             |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index 1f996ef7f6..8bd837fec8 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -23,22 +23,23 @@
 (require 'csharp-mode)
 (require 'package)
 
-;; development only packages, not declared as a package-dependency
-;; FIXME: loading a .el file from `load-path' should not change user's settings
-;; like that.  It can happen without the user explicitly requesting it!
-(package-initialize)
-(add-to-list 'package-archives '("melpa" . 
"https://stable.melpa.org/packages/";))
-
-;; required to resolve SEQ (or anything on elpa) on Emacs25.
-(setq package-check-signature nil)
-(setq network-security-level 'low)  ; see 
https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
-
-;; assess depends on dash 2.12.1, which is no longer available
-;; installing dash, resolves 2.13.0, and fixes this broken dependency.
-(dolist (p '(dash assess))
-  (when (not (package-installed-p p))
-    (package-refresh-contents)
-    (package-install p)))
+(defun csharp-mode-tests-setup ()
+  "Prepare `csharp-mode' for running tests via make."
+
+  ;; development only packages, not declared as a package-dependency
+  (package-initialize)
+  (add-to-list 'package-archives '("melpa" . 
"https://stable.melpa.org/packages/";))
+
+  ;; required to resolve SEQ (or anything on elpa) on Emacs25.
+  (setq package-check-signature nil)
+  (setq network-security-level 'low)  ; see 
https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
+
+  ;; assess depends on dash 2.12.1, which is no longer available
+  ;; installing dash, resolves 2.13.0, and fixes this broken dependency.
+  (dolist (p '(dash assess))
+    (when (not (package-installed-p p))
+      (package-refresh-contents)
+      (package-install p))))
 
 ;;; test-helper functions
 
diff --git a/makefile b/makefile
index c7deb34b41..f705098b53 100644
--- a/makefile
+++ b/makefile
@@ -13,7 +13,7 @@ build: package
 
 test:
        @echo "Testing..."
-       $(EMACS) -Q -batch -L . -l csharp-mode-tests.el -f 
ert-run-tests-batch-and-exit
+       $(EMACS) -Q -batch -L . -l csharp-mode-tests.el -f 
csharp-mode-tests-setup -f ert-run-tests-batch-and-exit
 
 clean:
        $(EASK) clean-elc