bug#51665: 28.0.50; [PATCH] Get electric-tests to pass

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

On 11/7/2021 8:24 AM, Lars Ingebrigtsen wrote:
> dick.r.chiang@gmail.com writes:
> 
>> Subject: [PATCH] electric-tests can no longer by byte compiled
> 
> Isn't that the bug, though?  We've been trying to find out why.

I've been tinkering with this and I *think* the issue is with the hook I 
added at global scope:

   (add-hook 'c-mode-hook (lambda () (c-toggle-comment-style -1)))

In the attached patch, I moved this into a fixture function for the 
`whitespace-chomping-dont-cross-comments' test and it works for me (i.e. 
electric-tests pass both with and without byte-compilation). Hopefully 
this resolves the issue, though I'm unclear on *why* this was occurring 
in the first place; maybe there's a bug in the byte-compiler...?

(As an aside, I vaguely recall adding that hook at global scope because 
multiple tests failed without it, but it was a while since I wrote that 
patch and I may be misremembering. In any case, it seems that at least 
today, changing the comment style is only needed for that one test, so I 
think it makes sense to do it in a fixture solely for that test.)

[-- Attachment #2: 0001-Fix-electric-tests.patch --]
[-- Type: text/plain, Size: 1381 bytes --]

From 6df04751816f268124b3fab19ef5c9d2cd983002 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Sun, 7 Nov 2021 10:22:54 -0800
Subject: [PATCH] ; Fix electric-tests

* test/lisp/electric-tests.el
(whitespace-chomping-dont-cross-comments):
Move 'c-toggle-comment-style' to here.
---
 test/lisp/electric-tests.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 686641c1b3..1e32dbfb60 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -32,9 +32,6 @@
 (require 'elec-pair)
 (require 'cl-lib)
 
-;; When running tests in c-mode, use single-line comments (//).
-(add-hook 'c-mode-hook (lambda () (c-toggle-comment-style -1)))
-
 (defun call-with-saved-electric-modes (fn)
   (let ((saved-electric (if electric-pair-mode 1 -1))
         (saved-layout (if electric-layout-mode 1 -1))
@@ -431,7 +428,9 @@ whitespace-chomping-dont-cross-comments
   :bindings '((electric-pair-skip-whitespace . chomp))
   :test-in-strings nil
   :test-in-code nil
-  :test-in-comments t)
+  :test-in-comments t
+  :fixture-fn (lambda () (when (eq major-mode 'c-mode)
+                           (c-toggle-comment-style -1))))
 
 (define-electric-pair-test whitespace-skipping-for-quotes-not-outside
   "  \"  \"" "\"-----" :expected-string "\"\"  \"  \""
-- 
2.25.1