emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/proof-general 227e462590 2/3: coq-par-compile: adapt coqde


From: ELPA Syncer
Subject: [nongnu] elpa/proof-general 227e462590 2/3: coq-par-compile: adapt coqdep warning regexp to 8.19
Date: Sun, 7 Jan 2024 19:00:15 -0500 (EST)

branch: elpa/proof-general
commit 227e462590eda7842600f18a1bca64bd706a648d
Author: Hendrik Tews <hendrik@askra.de>
Commit: hendriktews <hendrik@askra.de>

    coq-par-compile: adapt coqdep warning regexp to 8.19
---
 CHANGES                                       | 4 +++-
 ci/compile-tests/010-coqdep-errors/runtest.el | 2 --
 coq/coq-compile-common.el                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3c5bcec8d1..3c2e54ffb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,9 @@ the Git ChangeLog, the GitHub repo 
https://github.com/ProofGeneral/PG
 
 * Changes of Proof General 4.6 from Proof General 4.5
 
-N/A
+** Coq changes
+
+*** support Coq 8.19
 
 * Changes of Proof General 4.5 from Proof General 4.4
 
diff --git a/ci/compile-tests/010-coqdep-errors/runtest.el 
b/ci/compile-tests/010-coqdep-errors/runtest.el
index 646ff2a5b7..73800a1b71 100644
--- a/ci/compile-tests/010-coqdep-errors/runtest.el
+++ b/ci/compile-tests/010-coqdep-errors/runtest.el
@@ -34,7 +34,6 @@
 ;;; Define the tests
 
 (ert-deftest cct-coqdep-fail-on-require ()
-  :expected-result (if (coq--post-v818) :failed :passed)
   "coqdep error on missing library in a require command is detected."
   ;; (setq cct--debug-tests t)
   ;; (setq coq--debug-auto-compilation t)
@@ -97,7 +96,6 @@
 
 
 (ert-deftest cct-coqdep-fail-on-require-in-dependency ()
-  :expected-result (if (coq--post-v818) :failed :passed)
   "coqdep error because of a missing library in a dependency is detected."
   (let (coqdep-errror-in-response
         missing-module-in-response
diff --git a/coq/coq-compile-common.el b/coq/coq-compile-common.el
index f5a9da8bf8..b19f697fe4 100644
--- a/coq/coq-compile-common.el
+++ b/coq/coq-compile-common.el
@@ -523,7 +523,7 @@ or not."
   :safe (lambda (v) (cl-every #'stringp v)))
 
 (defcustom coq-coqdep-error-regexp
-  (concat "^\\*\\*\\* Warning: in file .*, library .* is required "
+  (concat "^\\(\\*\\*\\* \\)?Warning: in file .*, library[ \n].* is required "
           "and has not been found")
   "Regexp to match errors in the output of coqdep.
 coqdep indicates errors not always via a non-zero exit status,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]