Merge from origin/emacs-25

[gnu-emacs] / test / lisp / progmodes / flymake-tests.el

diff --git a/test/automated/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
similarity index 97%
rename from test/automated/flymake-tests.el
rename to test/lisp/progmodes/flymake-tests.el
index f3b830d36542690d92c7adbd1c10b20698b058ad..386516190bb42461f6ac18e29eca489e223803c5 100644 (file)
--- a/test/automated/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -26,7 +26,7 @@
 (require 'flymake)
 
 (defvar flymake-tests-data-directory
-  (expand-file-name "data/flymake" (getenv "EMACS_TEST_DIRECTORY"))
+  (expand-file-name "lisp/progmodes/flymake-resources" (getenv "EMACS_TEST_DIRECTORY"))
   "Directory containing flymake test data.")
 
 \f