; * test/infra/android/test-controller.el: minor regexp snags

(cherry picked from commit 773108fc0456c6c164aa60881929fdd59232c946)

diff --git a/test/infra/android/test-controller.el b/test/infra/android/test-controller.el
index 4a8b592648bd2df8570595bec7c7e28477c07b8b..63fa54336a74c00be97fa19fb1b3f5f1ea5d1bbb 100644 (file)
--- a/test/infra/android/test-controller.el
+++ b/test/infra/android/test-controller.el
@@ -204,7 +204,7 @@ it returns true, with ARG provided as a second argument."
              (save-excursion
                (goto-char beg)
                (save-match-data
-                 (when (re-search-forward "\\([RSDZTtWXxKWPI]\\) " nil t)
+                 (when (re-search-forward "\\([RSDZTtWXxKPI]\\) " nil t)
                    (setq beg (point))
                    (push (cons 'S (match-string 1)) process)))))
            (push (cons column (buffer-substring beg (match-beginning 0)))
@@ -2348,7 +2348,7 @@ a likewise structured directory tree."
   (let* ((default-directory (expand-file-name dir))
         (start (length default-directory)))
     (let ((dirs (directory-files-recursively
-                dir "^[[:alnum:]-]+-tests\\.el$"
+                dir "\\`[[:alnum:]-]+-tests\\.el\\'"
                 ;; Do not recurse into resource directories, as ERC's
                 ;; contain several files that resemble tests.
                 nil (lambda (dir-name)