Fix 'Skip' behavior in erts files (bug#76839)

* lisp/emacs-lisp/ert.el (ert-test--erts-test): Fix 'Skip'
behavior in erts files, so only the test case where it is
specified is skipped.
* test/lisp/emacs-lisp/ert-tests.el (ert-test-erts-skip-one)
(ert-test-erts-skip-last): Add test cases.

(cherry picked from commit d164116aa52b10bdfe8242dd1089406d4e557f32)

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 3548b3baf59661e29b29f0c5b06d648f2ea79b42..cffb5a4866bad156674496f0c3e8aa45f620788a 100644 (file)
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -2910,7 +2910,7 @@ write erts files."
     (if (and skip
              (eval (car (read-from-string skip))))
         ;; Skipping this test.
-        ()
+        (goto-char end-after)
       ;; Do the test.
       (goto-char end-after)
       ;; We have a separate after section.

diff --git a/test/lisp/emacs-lisp/ert-resources/erts-skip-last.erts b/test/lisp/emacs-lisp/ert-resources/erts-skip-last.erts
new file mode 100644 (file)
index 0000000..fd39efc
--- /dev/null
+++ b/test/lisp/emacs-lisp/ert-resources/erts-skip-last.erts
@@ -0,0 +1,8 @@
+Name: last
+Skip: t
+
+=-=
+FOO
+=-=
+BAR
+=-=-=

diff --git a/test/lisp/emacs-lisp/ert-resources/erts-skip-one.erts b/test/lisp/emacs-lisp/ert-resources/erts-skip-one.erts
new file mode 100644 (file)
index 0000000..3b35081
--- /dev/null
+++ b/test/lisp/emacs-lisp/ert-resources/erts-skip-one.erts
@@ -0,0 +1,16 @@
+Name: first
+Skip: t
+
+=-=
+FOO
+=-=
+FOO
+=-=-=
+
+Name: second
+
+=-=
+FOO
+=-=
+BAR
+=-=-=

diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el
index fa9096b58796ce9a1e7031953c12df0020bdc515..f6da801eb0ce0477d53e8d020d37c7452f4d79ac 100644 (file)
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -28,6 +28,7 @@
 
 (require 'cl-lib)
 (require 'ert)
+(require 'ert-x)
 
 ;;; Self-test that doesn't rely on ERT, for bootstrapping.
 
@@ -1029,6 +1030,17 @@ F failing-test
                  (ert-with-test-buffer (:name "foo" :selected t)
                    (buffer-name)))))
 
+(ert-deftest ert-test-erts-skip-one ()
+  "Test that Skip does not affect subsequent test cases (Bug#76839)."
+  (should-error (ert-test-erts-file (ert-resource-file "erts-skip-one.erts")
+                                    (lambda () ()))
+                :type 'ert-test-failed))
+
+(ert-deftest ert-test-erts-skip-last ()
+  "Test that Skip does not fail on last test case (Bug#76839)."
+  (ert-test-erts-file (ert-resource-file "erts-skip-last.erts")
+                      (lambda () ())))
+
 (provide 'ert-tests)
 
 ;;; ert-tests.el ends here