2 files changed, 35 insertions, 0 deletions

diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el
new file mode 100644
index 00000000000..204a4b93ab5
--- /dev/null
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -0,0 +1,34 @@
+;; Copyright (C) 2017  Free Software Foundation, Inc
+
+;; Maintainer: emacs-devel@gnu.org
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'smerge-mode)
+
+(ert-deftest smerge-mode-test-empty-hunk ()
+  "Regression test for bug #25555"
+  (with-temp-buffer
+    (insert "<<<<<<< one\n")
+    (save-excursion
+      (insert "=======\nLLL\n>>>>>>> end\n"))
+    (smerge-mode)
+    (smerge-keep-current)
+    (should (equal (buffer-substring (point-min) (point-max)) ""))))
+
+(provide 'smerge-mode-tests)
diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el
index 962902eb100..3d0942c8d15 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -51,6 +51,7 @@ B is considered the exact value."
 
 (ert-deftest lcms-cri-cam02-ucs ()
   "Test use of `lcms-cam02-ucs'."
+  (skip-unless (featurep 'lcms2))
   (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error"))
   (should-error (lcms-cam02-ucs '(0 0 0) 'error))
   (should-not