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.

diff --git a/.gitignore b/.gitignore
index 188dd9f55d83002c2e6592b78cdb922e58776f95..d05352e712431ce9f7068863bc74674dea4e35a0 100644 (file)
--- 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 c4ff2c70147ac86262b078cd6a8b1c3c6971451a..6fa11867a5e7d41bf218889c9376ce17062eb0e7 100644 (file)
--- 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/data/flymake/Makefile b/test/automated/data/flymake/Makefile
new file mode 100644 (file)
index 0000000..33af51c
--- /dev/null
+++ b/test/automated/data/flymake/Makefile
@@ -0,0 +1,8 @@
+# Makefile for flymake tests
+
+CC_OPTS = -Wall
+
+check-syntax:
+       $(CC) $(CC_OPTS) ${CHK_SOURCES}
+
+# eof

diff --git a/test/automated/data/flymake/test.c b/test/automated/data/flymake/test.c
new file mode 100644 (file)
index 0000000..3a39261
--- /dev/null
+++ b/test/automated/data/flymake/test.c
@@ -0,0 +1,5 @@
+int main()
+{
+  char c = 1000;
+  return c;
+}

diff --git a/test/automated/data/flymake/test.pl b/test/automated/data/flymake/test.pl
new file mode 100644 (file)
index 0000000..2013b2e
--- /dev/null
+++ b/test/automated/data/flymake/test.pl
@@ -0,0 +1,2 @@
+@arr = [1,2,3,4];
+@arr[1] = -1;

diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el
index e5f444e262b40da51d3191656c44ae7c57268a3a..2a18a5e30fbbfefd0c3d6f730de14a09dd92c9a6 100644 (file)
--- 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.")
 
 \f

diff --git a/test/automated/flymake/warnpred/Makefile b/test/automated/flymake/warnpred/Makefile
deleted file mode 100644 (file)
index 33af51c..0000000
--- a/test/automated/flymake/warnpred/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Makefile for flymake tests
-
-CC_OPTS = -Wall
-
-check-syntax:
-       $(CC) $(CC_OPTS) ${CHK_SOURCES}
-
-# eof

diff --git a/test/automated/flymake/warnpred/test.c b/test/automated/flymake/warnpred/test.c
deleted file mode 100644 (file)
index 3a39261..0000000
--- a/test/automated/flymake/warnpred/test.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main()
-{
-  char c = 1000;
-  return c;
-}

diff --git a/test/automated/flymake/warnpred/test.pl b/test/automated/flymake/warnpred/test.pl
deleted file mode 100644 (file)
index 2013b2e..0000000
--- a/test/automated/flymake/warnpred/test.pl
+++ /dev/null
@@ -1,2 +0,0 @@
-@arr = [1,2,3,4];
-@arr[1] = -1;