summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-12-15 20:41:03 -0500
committerGlenn Morris <rgm@gnu.org>2014-12-15 20:41:03 -0500
commite2aec9bee32236f931df57ae621eb2666408da48 (patch)
treed762a1a60ce3616c25a14ceb6095182f9d6ea124
parentf2301ecc237858a029def9afaabe0fdf91591ebc (diff)
downloademacs-e2aec9bee32236f931df57ae621eb2666408da48.tar.gz
Move flymake test data to more standard location
* test/automated/flymake-tests.el (flymake-tests-data-directory): Change from flymake/warnpred to more standard data/flymake. * .gitignore: Update for relocated flymake test data.
-rw-r--r--.gitignore2
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/data/flymake/Makefile (renamed from test/automated/flymake/warnpred/Makefile)0
-rw-r--r--test/automated/data/flymake/test.c (renamed from test/automated/flymake/warnpred/test.c)0
-rw-r--r--test/automated/data/flymake/test.pl (renamed from test/automated/flymake/warnpred/test.pl)0
-rw-r--r--test/automated/flymake-tests.el2
6 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 188dd9f55d8..d05352e7124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ InfoPlist.strings
Makefile
!admin/charsets/Makefile
!etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
!test/indent/Makefile
makefile
/*.cache
diff --git a/test/ChangeLog b/test/ChangeLog
index c4ff2c70147..6fa11867a5e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-16 Glenn Morris <rgm@gnu.org>
+
+ * automated/flymake-tests.el (flymake-tests-data-directory):
+ Change from flymake/warnpred to more standard data/flymake.
+
2014-12-11 Michael Albinus <michael.albinus@gmx.de>
* automated/vc-tests.el (vc-test--revision-granularity-function):
diff --git a/test/automated/flymake/warnpred/Makefile b/test/automated/data/flymake/Makefile
index 33af51c3337..33af51c3337 100644
--- a/test/automated/flymake/warnpred/Makefile
+++ b/test/automated/data/flymake/Makefile
diff --git a/test/automated/flymake/warnpred/test.c b/test/automated/data/flymake/test.c
index 3a3926131f5..3a3926131f5 100644
--- a/test/automated/flymake/warnpred/test.c
+++ b/test/automated/data/flymake/test.c
diff --git a/test/automated/flymake/warnpred/test.pl b/test/automated/data/flymake/test.pl
index 2013b2e4434..2013b2e4434 100644
--- a/test/automated/flymake/warnpred/test.pl
+++ b/test/automated/data/flymake/test.pl
diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el
index e5f444e262b..2a18a5e30fb 100644
--- a/test/automated/flymake-tests.el
+++ b/test/automated/flymake-tests.el
@@ -26,7 +26,7 @@
(require 'flymake)
(defvar flymake-tests-data-directory
- (expand-file-name "flymake/warnpred" (getenv "EMACS_TEST_DIRECTORY"))
+ (expand-file-name "data/flymake" (getenv "EMACS_TEST_DIRECTORY"))
"Directory containing flymake test data.")