Merge branch 'pr/1949' into maint

* pr/1949:
  Run emacs tests from test_suite
  Emacs: consider case in erlang-get-identifier-at-point
  Emacs: do not accept compiler warnings in selected elisp files
  Emacs: add test-erlang-mode

1 files changed, 41 insertions, 36 deletions

diff --git a/lib/tools/emacs/erlang-test.el b/lib/tools/emacs/erlang-test.el
index efe3d515e9..2ee584d11a 100644
--- a/lib/tools/emacs/erlang-test.el
+++ b/lib/tools/emacs/erlang-test.el
@@ -29,7 +29,7 @@
 
 ;; This library require GNU Emacs 25 or later.
 ;;
-;; There are two ways to run emacs unit tests.
+;; There are three ways to run the erlang emacs unit tests.
 ;;
 ;; 1. Within a running emacs process.  Load this file.  Then to run
 ;; all defined test cases:
@@ -49,11 +49,15 @@
 ;;
 ;; The -L option adds a directory to the load-path.  It should be the
 ;; directory containing erlang.el and erlang-test.el.
+;;
+;; 3. Call the script test-erlang-mode in this directory.  This script
+;; use the second method.
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl))
 (require 'ert)
-(require 'cl-lib)
 (require 'erlang)
 
 (defvar erlang-test-code
@@ -63,7 +67,7 @@
     ("SYMBOL" . "-define(SYMBOL, value).")
     ("MACRO" . "-define(MACRO(X), X + X).")
     ("struct" . "-record(struct, {until,maps,are,everywhere}).")
-    ("function". "function() -> #struct{}."))
+    ("function" . "function() -> #struct{}."))
   "Alist of erlang test code.
 Each entry have the format (TAGNAME . ERLANG_CODE).  If TAGNAME
 is nil there is no definitions in the ERLANG_CODE.  The
@@ -116,8 +120,8 @@ concatenated to form an erlang file to test on.")
 
 (defun erlang-test-create-erlang-file (erlang-file)
   (with-temp-file erlang-file
-    (cl-loop for (_ . code) in erlang-test-code
-             do (insert code "\n"))))
+    (loop for (_ . code) in erlang-test-code
+          do (insert code "\n"))))
 
 (defun erlang-test-compile-tags (erlang-file tags-file)
   (should (zerop (call-process "etags" nil nil nil
@@ -132,19 +136,20 @@ concatenated to form an erlang file to test on.")
                  (sort (erlang-expected-completion-table) #'string-lessp))))
 
 (defun erlang-expected-completion-table ()
-  (append (cl-loop for (symbol . _) in erlang-test-code
-                   when (stringp symbol)
-                   append (list symbol (concat "erlang_test:" symbol)))
+  (append (loop for (symbol . _) in erlang-test-code
+                when (stringp symbol)
+                append (list symbol (concat "erlang_test:" symbol)))
           (list "erlang_test:" "erlang_test:module_info")))
 
 (defun erlang-test-xref-find-definitions (erlang-file erlang-buffer)
-  (cl-loop for (tagname . code) in erlang-test-code
-           for line = 1 then (1+ line)
-           do (when tagname
-                (switch-to-buffer erlang-buffer)
-                (erlang-test-xref-jump tagname erlang-file line)
-                (erlang-test-xref-jump (concat "erlang_test:" tagname)
-                                       erlang-file line)))
+  (loop for (tagname . code) in erlang-test-code
+        for line = 1 then (1+ line)
+        do (when tagname
+             (switch-to-buffer erlang-buffer)
+             (erlang-test-xref-jump tagname erlang-file line)
+             (when (string-equal tagname "function")
+               (erlang-test-xref-jump (concat "erlang_test:" tagname)
+                                      erlang-file line))))
   (erlang-test-xref-jump "erlang_test:" erlang-file 1))
 
 (defun erlang-test-xref-jump (id expected-file expected-line)
@@ -213,27 +218,27 @@ concatenated to form an erlang file to test on.")
 
 
 (ert-deftest erlang-test-parse-id ()
-  (cl-loop for id-string in '("fun/10"
-                              "qualified-function module:fun/10"
-                              "record reko"
-                              "macro _SYMBOL"
-                              "macro MACRO/10"
-                              "module modula"
-                              "macro"
-                              nil)
-           for id-list in '((nil nil "fun" 10)
-                            (qualified-function "module" "fun" 10)
-                            (record nil "reko" nil)
-                            (macro nil "_SYMBOL" nil)
-                            (macro nil "MACRO" 10)
-                            (module nil "modula" nil)
-                            (nil nil "macro" nil)
-                            nil)
-           for id-list2 = (erlang-id-to-list id-string)
-           do (should (equal id-list id-list2))
-           for id-string2 = (erlang-id-to-string id-list)
-           do (should (equal id-string id-string2))
-           collect id-list2))
+  (loop for id-string in '("fun/10"
+                           "qualified-function module:fun/10"
+                           "record reko"
+                           "macro _SYMBOL"
+                           "macro MACRO/10"
+                           "module modula"
+                           "macro"
+                           nil)
+        for id-list in '((nil nil "fun" 10)
+                         (qualified-function "module" "fun" 10)
+                         (record nil "reko" nil)
+                         (macro nil "_SYMBOL" nil)
+                         (macro nil "MACRO" 10)
+                         (module nil "modula" nil)
+                         (nil nil "macro" nil)
+                         nil)
+        for id-list2 = (erlang-id-to-list id-string)
+        do (should (equal id-list id-list2))
+        for id-string2 = (erlang-id-to-string id-list)
+        do (should (equal id-string id-string2))
+        collect id-list2))
 
 
 (provide 'erlang-test)