diff --git a/.travis.yml b/.travis.yml index b9a4d1c..335a21c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: emacs-lisp env: + - EVM_EMACS=emacs-25.1-travis + - EVM_EMACS=emacs-25.2-travis - EVM_EMACS=emacs-26.1-travis - EVM_EMACS=emacs-git-snapshot-travis diff --git a/emacsql-sqlite3-test.el b/emacsql-sqlite3-test.el index 679e092..ba56552 100644 --- a/emacsql-sqlite3-test.el +++ b/emacsql-sqlite3-test.el @@ -5,6 +5,12 @@ (require 'emacsql) (require 'emacsql-sqlite3) +;; Workaround for known bug of ert-runner +;; https://github.com/rejeep/ert-runner.el/issues/49 +(eval-and-compile + (unless (fboundp 'ert--print-backtrace) + (defalias 'ert--print-backtrace #'backtrace-to-string))) + (defvar emacsql-tests-timeout 4 "Be aggressive about not waiting on subprocesses in unit tests.") @@ -84,8 +90,8 @@ (cl-letf* ((proc (emacsql-process conn)) (retsym (make-symbol "retsym")) ((process-filter proc) - (lambda (_proc string) - (throw retsym string)))) + (lambda (_proc string) + (throw retsym string)))) (catch retsym (apply #'emacsql-sqlite3-run-dot-command conn cmd args) (accept-process-output proc emacsql-tests-timeout)))) diff --git a/emacsql-sqlite3.el b/emacsql-sqlite3.el index de18559..4cac724 100644 --- a/emacsql-sqlite3.el +++ b/emacsql-sqlite3.el @@ -177,14 +177,13 @@ each arg will be quoted first." (if (looking-at (rx "Error: " (group (1+ char)) eol)) (signal 'emacsql-error (list (match-string 1))) (cl-macrolet ((sexps-in-line! () - `(cl-loop - until (looking-at "\n") - collect (read (current-buffer))))) + `(cl-loop until (looking-at "\n") + collect (read (current-buffer))))) (cl-loop - until (looking-at - (concat (regexp-quote emacsql-sqlite3--cmd-end-mark) "\n")) - collect (sexps-in-line!) - do (forward-char)))))) + until (looking-at + (concat (regexp-quote emacsql-sqlite3--cmd-end-mark) "\n")) + collect (sexps-in-line!) + do (forward-char)))))) (cl-defmethod emacsql-close ((conn emacsql-sqlite3-connection)) (let ((process (emacsql-process conn)))