From dc62e4a1f943f7ca49b3075d9160dc19856fae7b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:19:51 -0400 Subject: [PATCH 4/4] testing/lisp/*.el: Fix second arg to `signal` The second argument to `signal` should be a list, as explained in its docstring. Fix `missing-test-dependency` signals accordingly. --- testing/lisp/test-ob-C.el | 2 +- testing/lisp/test-ob-R.el | 4 ++-- testing/lisp/test-ob-awk.el | 2 +- testing/lisp/test-ob-calc.el | 2 +- testing/lisp/test-ob-clojure.el | 2 +- testing/lisp/test-ob-eshell.el | 2 +- testing/lisp/test-ob-fortran.el | 2 +- testing/lisp/test-ob-haskell-ghci.el | 4 ++-- testing/lisp/test-ob-java.el | 2 +- testing/lisp/test-ob-julia.el | 4 ++-- testing/lisp/test-ob-lua.el | 2 +- testing/lisp/test-ob-maxima.el | 2 +- testing/lisp/test-ob-octave.el | 2 +- testing/lisp/test-ob-perl.el | 2 +- testing/lisp/test-ob-python.el | 2 +- testing/lisp/test-ob-ruby.el | 4 ++-- testing/lisp/test-ob-scheme.el | 6 +++--- testing/lisp/test-ob-sed.el | 2 +- testing/lisp/test-ob-shell.el | 2 +- testing/lisp/test-ob-sql.el | 2 +- testing/lisp/test-ob-sqlite.el | 2 +- testing/lisp/test-org-ctags.el | 2 +- testing/lisp/test-org-tempo.el | 2 +- testing/lisp/test-ox-ascii.el | 2 +- testing/lisp/test-ox-beamer.el | 2 +- testing/lisp/test-ox-latex.el | 2 +- testing/lisp/test-ox-texinfo.el | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/testing/lisp/test-ob-C.el b/testing/lisp/test-ob-C.el index c70534a51f..5399aed122 100644 --- a/testing/lisp/test-ob-C.el +++ b/testing/lisp/test-ob-C.el @@ -20,7 +20,7 @@ ;;; Code: (unless (featurep 'ob-C) - (signal 'missing-test-dependency "Support for C code blocks")) + (signal 'missing-test-dependency '("Support for C code blocks"))) (ert-deftest ob-C/simple-program () "Hello world program." diff --git a/testing/lisp/test-ob-R.el b/testing/lisp/test-ob-R.el index 9ffbf3afd9..0d291bf543 100644 --- a/testing/lisp/test-ob-R.el +++ b/testing/lisp/test-ob-R.el @@ -22,7 +22,7 @@ (org-test-for-executable "R") (require 'ob-core) (unless (featurep 'ess) - (signal 'missing-test-dependency "ESS")) + (signal 'missing-test-dependency '("ESS"))) (defvar ess-ask-for-ess-directory) (defvar ess-history-file) (defvar ess-r-post-run-hook) @@ -32,7 +32,7 @@ (declare-function ess-calculate-width "ext:ess-inf" (opt)) (unless (featurep 'ob-R) - (signal 'missing-test-dependency "Support for R code blocks")) + (signal 'missing-test-dependency '("Support for R code blocks"))) (ert-deftest test-ob-R/simple-session () (let (ess-ask-for-ess-directory ess-history-file) diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el index 874d2c0268..b3a2a50fce 100644 --- a/testing/lisp/test-ob-awk.el +++ b/testing/lisp/test-ob-awk.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "awk") (unless (featurep 'ob-awk) - (signal 'missing-test-dependency "Support for Awk code blocks")) + (signal 'missing-test-dependency '("Support for Awk code blocks"))) (ert-deftest ob-awk/input-none () "Test with no input file" diff --git a/testing/lisp/test-ob-calc.el b/testing/lisp/test-ob-calc.el index 12f97279f6..f6e8a5a2fd 100644 --- a/testing/lisp/test-ob-calc.el +++ b/testing/lisp/test-ob-calc.el @@ -21,7 +21,7 @@ (require 'ob-calc) (unless (featurep 'ob-calc) - (signal 'missing-test-dependency "Support for Calc code blocks")) + (signal 'missing-test-dependency '("Support for Calc code blocks"))) (ert-deftest ob-calc/simple-program-mult () "Test of simple multiplication." diff --git a/testing/lisp/test-ob-clojure.el b/testing/lisp/test-ob-clojure.el index 33052c98c9..4836917b3a 100644 --- a/testing/lisp/test-ob-clojure.el +++ b/testing/lisp/test-ob-clojure.el @@ -25,7 +25,7 @@ ;;; Code: (unless (featurep 'ob-clojure) - (signal 'missing-test-dependency "Support for Clojure code blocks")) + (signal 'missing-test-dependency '("Support for Clojure code blocks"))) ;; FIXME: The old tests where totally off. We need to write new tests. diff --git a/testing/lisp/test-ob-eshell.el b/testing/lisp/test-ob-eshell.el index 0d704b16a3..5d0da8d991 100644 --- a/testing/lisp/test-ob-eshell.el +++ b/testing/lisp/test-ob-eshell.el @@ -24,7 +24,7 @@ ;;; Code: (unless (featurep 'ob-eshell) - (signal 'missing-test-dependency "Support for Eshell code blocks")) + (signal 'missing-test-dependency '("Support for Eshell code blocks"))) (ert-deftest ob-eshell/execute () "Test ob-eshell execute." diff --git a/testing/lisp/test-ob-fortran.el b/testing/lisp/test-ob-fortran.el index 4947d142b7..209a966b16 100644 --- a/testing/lisp/test-ob-fortran.el +++ b/testing/lisp/test-ob-fortran.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "gfortran") (unless (featurep 'ob-fortran) - (signal 'missing-test-dependency "Support for Fortran code blocks")) + (signal 'missing-test-dependency '("Support for Fortran code blocks"))) (ert-deftest ob-fortran/simple-program () "Test of hello world program." diff --git a/testing/lisp/test-ob-haskell-ghci.el b/testing/lisp/test-ob-haskell-ghci.el index 990addcd44..6eca0a141a 100644 --- a/testing/lisp/test-ob-haskell-ghci.el +++ b/testing/lisp/test-ob-haskell-ghci.el @@ -32,9 +32,9 @@ (require 'org-test "../testing/org-test") (org-test-for-executable "ghci") (unless (featurep 'haskell-mode) - (signal 'missing-test-dependency "haskell-mode")) + (signal 'missing-test-dependency '("haskell-mode"))) (unless (featurep 'haskell) - (signal 'missing-test-dependency "haskell")) + (signal 'missing-test-dependency '("haskell"))) ;;; Helpers diff --git a/testing/lisp/test-ob-java.el b/testing/lisp/test-ob-java.el index e0c19fe03c..5f00917e51 100644 --- a/testing/lisp/test-ob-java.el +++ b/testing/lisp/test-ob-java.el @@ -27,7 +27,7 @@ ;; ob-java is needed for linter tests as well. org-lint relies on ;; default header arg value. (unless (featurep 'ob-java) - (signal 'missing-test-dependency "Support for java code blocks")) + (signal 'missing-test-dependency '("Support for java code blocks"))) ;;; No Java required diff --git a/testing/lisp/test-ob-julia.el b/testing/lisp/test-ob-julia.el index 4472972624..c0d21fbd85 100644 --- a/testing/lisp/test-ob-julia.el +++ b/testing/lisp/test-ob-julia.el @@ -23,9 +23,9 @@ (org-test-for-executable "julia") (require 'ob-core) (unless (featurep 'ob-julia) - (signal 'missing-test-dependency "Support for julia code blocks")) + (signal 'missing-test-dependency '("Support for julia code blocks"))) (unless (featurep 'ess) - (signal 'missing-test-dependency "ESS")) + (signal 'missing-test-dependency '("ESS"))) (ert-deftest test-ob-julia/colnames-yes-header-argument () (should diff --git a/testing/lisp/test-ob-lua.el b/testing/lisp/test-ob-lua.el index 0a60c68caf..864d5107a3 100644 --- a/testing/lisp/test-ob-lua.el +++ b/testing/lisp/test-ob-lua.el @@ -20,7 +20,7 @@ ;;; Code: (unless (featurep 'ob-lua) - (signal 'missing-test-dependency "Support for Lua code blocks")) + (signal 'missing-test-dependency '("Support for Lua code blocks"))) (ert-deftest test-ob-lua/simple-value () "Test associative array return by value." diff --git a/testing/lisp/test-ob-maxima.el b/testing/lisp/test-ob-maxima.el index 653ed40417..4320c46137 100644 --- a/testing/lisp/test-ob-maxima.el +++ b/testing/lisp/test-ob-maxima.el @@ -20,7 +20,7 @@ (org-test-for-executable "maxima") (unless (featurep 'ob-maxima) - (signal 'missing-test-dependency "Support for Maxima code blocks")) + (signal 'missing-test-dependency '("Support for Maxima code blocks"))) (ert-deftest ob-maxima/integer-input () "Test of integer input" diff --git a/testing/lisp/test-ob-octave.el b/testing/lisp/test-ob-octave.el index dfcfc01906..3c58fad741 100644 --- a/testing/lisp/test-ob-octave.el +++ b/testing/lisp/test-ob-octave.el @@ -20,7 +20,7 @@ (org-test-for-executable "octave") (unless (featurep 'ob-octave) - (signal 'missing-test-dependency "Support for Octave code blocks")) + (signal 'missing-test-dependency '("Support for Octave code blocks"))) (ert-deftest ob-octave/input-none () "Number output" diff --git a/testing/lisp/test-ob-perl.el b/testing/lisp/test-ob-perl.el index 5826e8cca2..e079d09d9b 100644 --- a/testing/lisp/test-ob-perl.el +++ b/testing/lisp/test-ob-perl.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "perl") (unless (featurep 'ob-perl) - (signal 'missing-test-dependency "Support for perl code blocks")) + (signal 'missing-test-dependency '("Support for perl code blocks"))) (ert-deftest test-ob-perl/simple-output () (org-test-with-temp-text " diff --git a/testing/lisp/test-ob-python.el b/testing/lisp/test-ob-python.el index e3c6a40096..9ee76f2a8d 100644 --- a/testing/lisp/test-ob-python.el +++ b/testing/lisp/test-ob-python.el @@ -22,7 +22,7 @@ (org-test-for-executable "python") (require 'ob-core) (unless (featurep 'ob-python) - (signal 'missing-test-dependency "Support for Python code blocks")) + (signal 'missing-test-dependency '("Support for Python code blocks"))) (ert-deftest test-ob-python/colnames-yes-header-argument () (should diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el index 2e4cd020be..27f96f6da3 100644 --- a/testing/lisp/test-ob-ruby.el +++ b/testing/lisp/test-ob-ruby.el @@ -19,9 +19,9 @@ ;;; Code: (org-test-for-executable "ruby") (unless (featurep 'ob-ruby) - (signal 'missing-test-dependency "Support for Ruby code blocks")) + (signal 'missing-test-dependency '("Support for Ruby code blocks"))) (unless (featurep 'inf-ruby) - (signal 'missing-test-dependency "inf-ruby")) + (signal 'missing-test-dependency '("inf-ruby"))) (ert-deftest test-ob-ruby/session-output-1 () (should (equal (org-test-with-temp-text "#+begin_src ruby :session org-test-ruby :results output diff --git a/testing/lisp/test-ob-scheme.el b/testing/lisp/test-ob-scheme.el index 3e9a4707c1..79ce2b4537 100644 --- a/testing/lisp/test-ob-scheme.el +++ b/testing/lisp/test-ob-scheme.el @@ -24,11 +24,11 @@ ;;; Code: (unless (featurep 'ob-scheme) - (signal 'missing-test-dependency "Support for Scheme code blocks")) + (signal 'missing-test-dependency '("Support for Scheme code blocks"))) (unless (featurep 'geiser) - (signal 'missing-test-dependency "geiser")) + (signal 'missing-test-dependency '("geiser"))) (unless (version<= "27.1" emacs-version) - (signal 'missing-test-dependency "Geiser required for Scheme code blocks needs Emacs >=27.1")) + (signal 'missing-test-dependency '("Geiser required for Scheme code blocks needs Emacs >=27.1"))) (ert-deftest test-ob-scheme/tables () "Test table output." diff --git a/testing/lisp/test-ob-sed.el b/testing/lisp/test-ob-sed.el index a91aa54cce..c57c798994 100644 --- a/testing/lisp/test-ob-sed.el +++ b/testing/lisp/test-ob-sed.el @@ -23,7 +23,7 @@ (require 'ob-sed) (org-test-for-executable "sed") (unless (featurep 'ob-sed) - (signal 'missing-test-dependency "Support for Sed code blocks")) + (signal 'missing-test-dependency '("Support for Sed code blocks"))) (ert-deftest ob-sed-test/simple-execution-of-script () "Test simple execution of script." diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el index b760031b4e..9addd045bb 100644 --- a/testing/lisp/test-ob-shell.el +++ b/testing/lisp/test-ob-shell.el @@ -30,7 +30,7 @@ (require 'org-macs) (unless (featurep 'ob-shell) - (signal 'missing-test-dependency "Support for Shell code blocks")) + (signal 'missing-test-dependency '("Support for Shell code blocks"))) (org-test-for-executable "sh") diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el index 919741571f..ac8a1ccb22 100644 --- a/testing/lisp/test-ob-sql.el +++ b/testing/lisp/test-ob-sql.el @@ -21,7 +21,7 @@ ;;; Code: (unless (featurep 'ob-sql) - (signal 'missing-test-dependency "Support for sql code blocks")) + (signal 'missing-test-dependency '("Support for sql code blocks"))) (defmacro ob-sql/command (&rest body) "Execute body and return the command that would have been executed." diff --git a/testing/lisp/test-ob-sqlite.el b/testing/lisp/test-ob-sqlite.el index 621a11b0b8..0d04643cf3 100644 --- a/testing/lisp/test-ob-sqlite.el +++ b/testing/lisp/test-ob-sqlite.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "sqlite3") (unless (featurep 'ob-sqlite) - (signal 'missing-test-dependency "Support for sqlite code blocks")) + (signal 'missing-test-dependency '("Support for sqlite code blocks"))) (ert-deftest ob-sqlite/table-variables-with-commas () "Test of a table variable that contains commas. This guarantees that this code path results in a valid CSV." diff --git a/testing/lisp/test-org-ctags.el b/testing/lisp/test-org-ctags.el index b8e3e4d223..4e0ee37ffe 100644 --- a/testing/lisp/test-org-ctags.el +++ b/testing/lisp/test-org-ctags.el @@ -23,7 +23,7 @@ ;; Alternative implementation for `test-org-ctags/mock-command' ;; is required for cmd.exe. (unless (string-equal "-c" shell-command-switch) - (signal 'missing-test-dependency "POSIX shell")) + (signal 'missing-test-dependency '("POSIX shell"))) (require 'org-ctags) diff --git a/testing/lisp/test-org-tempo.el b/testing/lisp/test-org-tempo.el index 0760d45326..7382b6dc42 100644 --- a/testing/lisp/test-org-tempo.el +++ b/testing/lisp/test-org-tempo.el @@ -24,7 +24,7 @@ (require 'org-tempo) (unless (featurep 'org-tempo) - (signal 'missing-test-dependency "org-tempo")) + (signal 'missing-test-dependency '("org-tempo"))) (ert-deftest test-org-tempo/completion () "Test that blocks and keywords are expanded correctly by org-tempo." diff --git a/testing/lisp/test-ox-ascii.el b/testing/lisp/test-ox-ascii.el index 2df1bd795a..0532b89ee1 100644 --- a/testing/lisp/test-ox-ascii.el +++ b/testing/lisp/test-ox-ascii.el @@ -25,7 +25,7 @@ (require 'ox-ascii nil t) (unless (featurep 'ox-ascii) - (signal 'missing-test-dependency "org-export-ascii")) + (signal 'missing-test-dependency '("org-export-ascii"))) diff --git a/testing/lisp/test-ox-beamer.el b/testing/lisp/test-ox-beamer.el index be83b12e03..f5743409f3 100644 --- a/testing/lisp/test-ox-beamer.el +++ b/testing/lisp/test-ox-beamer.el @@ -25,7 +25,7 @@ (require 'ox-beamer nil t) (unless (featurep 'ox-beamer) - (signal 'missing-test-dependency "org-export-beamer")) + (signal 'missing-test-dependency '("org-export-beamer"))) diff --git a/testing/lisp/test-ox-latex.el b/testing/lisp/test-ox-latex.el index d0be4e5a4c..892ac44374 100644 --- a/testing/lisp/test-ox-latex.el +++ b/testing/lisp/test-ox-latex.el @@ -25,7 +25,7 @@ (require 'ox-latex nil t) (unless (featurep 'ox-latex) - (signal 'missing-test-dependency "org-export-latex")) + (signal 'missing-test-dependency '("org-export-latex"))) diff --git a/testing/lisp/test-ox-texinfo.el b/testing/lisp/test-ox-texinfo.el index b67d2f4c17..b16a344e7e 100644 --- a/testing/lisp/test-ox-texinfo.el +++ b/testing/lisp/test-ox-texinfo.el @@ -27,7 +27,7 @@ (eval-when-compile (require 'subr-x)) (unless (featurep 'ox-texinfo) - (signal 'missing-test-dependency "org-export-texinfo")) + (signal 'missing-test-dependency '("org-export-texinfo"))) ;;; TeX fragments -- 2.39.2