Skip to content

Commit

Permalink
Merge pull request #7 from psibi/ci-29.2
Browse files Browse the repository at this point in the history
CI: Test against emacs 29.2
  • Loading branch information
psibi authored Feb 24, 2024
2 parents a98a624 + efdb033 commit 282d2c1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- 27.2
- 28.1
- 29.1
- 29.2
steps:
- uses: actions/checkout@v4
- uses: taiki-e/install-action@v2
Expand Down
3 changes: 1 addition & 2 deletions test/rustic-clippy-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
(write-file file1))

(if-let ((proc (call-interactively 'rustic-compile)))
(while (eq (process-status proc) 'run)
(sit-for 0.01)))
(rustic-test--wait-till-finished rustic-compilation-buffer-name))

(with-current-buffer buffer1
(revert-buffer t t)
Expand Down
7 changes: 3 additions & 4 deletions test/rustic-compilation-error-tests.el
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@
(sit-for 0.1))
(with-current-buffer (get-buffer rustic-compilation-buffer-name)
(should (= compilation-num-warnings-found 20)))))

(ert-deftest rustic-test-crate-path-error ()
(let* ((test-workspace (expand-file-name "test/test-project/"))
(test-crate (expand-file-name "test/test-project/crates/test-crate/")))
(let ((default-directory (expand-file-name "src" test-crate)))
(rustic-cargo-build)
(let* ((proc (get-process rustic-compilation-process-name))
(buffer (process-buffer proc)))
(while (eq (process-status proc) 'run)
(sit-for 0.01))
(rustic-test--wait-till-finished buffer)
(with-current-buffer buffer
(goto-char (point-min))
(when (re-search-forward "-->")
Expand Down Expand Up @@ -221,8 +221,7 @@
(rustic-cargo-build)
(let* ((proc (get-process rustic-compilation-process-name))
(buffer (process-buffer proc)))
(while (eq (process-status proc) 'run)
(sit-for 0.01))
(rustic-test--wait-till-finished buffer)
(with-current-buffer buffer
(should (string= default-directory test-workspace))
(should-not (get-text-property (point) 'compilation-message)))))))
Expand Down
4 changes: 1 addition & 3 deletions test/rustic-format-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,11 @@
'rustic-format-file-sentinel
:buffer buf
:files main)))
(while (eq (process-status proc) 'run)
(sit-for 0.1))))
(rustic-test--wait-till-finished rustic-format-buffer-name)))
(with-temp-buffer
(insert-file-contents main)
(should (string= (buffer-string) formatted-string)))))


;; rustfmt.toml

(defun rustic-test-format-create-rustfmt-toml (dir contents)
Expand Down

0 comments on commit 282d2c1

Please sign in to comment.