[nongnu] elpa/wgrep af59e8b3ee 4/8: workaround commit to work on github action.

[ELPA Syncer]

branch: elpa/wgrep
commit af59e8b3ee61b43407eed114aea42249dcd00755
Author: Masahiro Hayashi <mhayashi1120@gmail.com>
Commit: Masahiro Hayashi <mhayashi1120@gmail.com>

    workaround commit to work on github action.
---
 Makefile             |  2 +-
 wgrep-subtest.el     |  4 ++--
 wgrep-test-helper.el | 16 ++++++++--------
 wgrep-test.el        | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index e406bf95b4..7b5b2a7bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ EL += wgrep-ag.el
 EL += wgrep-helm.el
 EL += wgrep-pt.el
 EL += wgrep-deadgrep.el
-EL += wgrep-test-helper.el
 
 TEST_EL := wgrep-test.el
+TEST_EL += wgrep-test-helper.el
 
 ##
 ## Emacs
diff --git a/wgrep-subtest.el b/wgrep-subtest.el
index 1c530b26f2..9cf497b7fc 100644
--- a/wgrep-subtest.el
+++ b/wgrep-subtest.el
@@ -4,7 +4,7 @@
 
 (ert-deftest wgrep-ag-normal ()
   :tags '(wgrep-subtest)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "HOGE\nFOO\nBAZ\n"
      (lambda (file)
        (wgrep-test-helper--ag "FOO|HOGE" file)
@@ -27,7 +27,7 @@
 
 (ert-deftest wgrep-deadgrep-normal ()
   :tags '(wgrep-subtest)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "HOGE\nFOO\nBAZ\n"
      (lambda (file)
        (wgrep-test-helper--deadgrep "FOO|HOGE")
diff --git a/wgrep-test-helper.el b/wgrep-test-helper.el
index e8f292001e..b4bec5014b 100644
--- a/wgrep-test-helper.el
+++ b/wgrep-test-helper.el
@@ -4,24 +4,24 @@
 
 (require 'wgrep)
 
-(defun wgre-test-helper--wait (buf)
+(defun wgrep-test-helper--wait (buf)
   (let ((proc (get-buffer-process buf)))
     (while (eq (process-status proc) 'run)
       (sit-for 0.1))
     (sleep-for 0.2)
     (switch-to-buffer buf)))
 
-(defun wgre-test-helper--grep (command)
+(defun wgrep-test-helper--grep (command)
   (let ((buf (grep command)))
-    (wgre-test-helper--wait buf)))
+    (wgrep-test-helper--wait buf)))
 
-(defun wgre-test-helper--get-contents (file &optional cs)
+(defun wgrep-test-helper--get-contents (file &optional cs)
   (let ((coding-system-for-read cs))
     (with-temp-buffer
       (insert-file-contents file)
       (buffer-string))))
 
-(defun wgre-test-helper--prepare-file (file contents &optional cs)
+(defun wgrep-test-helper--prepare-file (file contents &optional cs)
   ;; cleanup for convenience
   (let ((buf (get-file-buffer file)))
     (when (buffer-live-p buf)
@@ -29,13 +29,13 @@
   (let ((coding-system-for-write cs))
     (write-region contents nil file)))
 
-(defun wgre-test-helper--cleanup-file (file)
+(defun wgrep-test-helper--cleanup-file (file)
   (when (file-exists-p file)
     (delete-file file))
   (when (file-exists-p (concat file "~"))
     (delete-file (concat file "~"))))
 
-(defmacro wgre-test-helper--default (&rest body)
+(defmacro wgrep-test-helper--default (&rest body)
   `(let ((wgrep-change-readonly-file nil)
          (wgrep-auto-save-buffer nil))
      (progn ,@body)))
@@ -51,4 +51,4 @@
   (wgrep-test-helper--wait (current-buffer)))
 
 
-(provide 'wgre-test-helper-helper)
+(provide 'wgrep-test-helper)
diff --git a/wgrep-test.el b/wgrep-test.el
index b9e6d98915..407e66dbb5 100644
--- a/wgrep-test.el
+++ b/wgrep-test.el
@@ -24,7 +24,7 @@
 
 (ert-deftest wgrep-normal ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "HOGE\nFOO\nBAZ\n"
      (lambda (file)
        (wgrep-test-helper--grep (concat "grep -nH -e FOO -C 1 " file))
@@ -52,7 +52,7 @@
 
 (ert-deftest wgrep-normal-with-newline ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "HOGE\n"
      (lambda (file)
        (wgrep-test-helper--grep (concat "grep -nH -e HOGE " file))
@@ -72,7 +72,7 @@
 
 (ert-deftest wgrep-bom-with-multibyte ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture '("あ\nい\nう\n" utf-8-with-signature)
      (lambda (file)
        (wgrep-test-helper--grep (concat "grep -nH -e 'あ' -A 2 " file))
@@ -95,7 +95,7 @@
 
 (ert-deftest wgrep-bom-with-unibyte ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture '("a\nb\n" utf-8-with-signature)
      (lambda (file)
        (wgrep-test-helper--grep (concat "grep -nH -e 'a' -A 2 " file))
@@ -113,7 +113,7 @@
 
 (ert-deftest wgrep-with-modify ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "a\nb\nc\n"
      (lambda (file)
        (let (;; This test intended to check modified buffer is existing.
@@ -147,7 +147,7 @@
 
 (ert-deftest wgrep-with-readonly-file ()
   :tags '(wgrep)
-  (wgrep-test/default
+  (wgrep-test-helper--default
    (wgrep-test-fixture "a\nb\nc\n"
      (lambda (file)
        ;; make readonly