Test infrastructure: updates after directory move

 * (test/Makefile.in): Support directories several levels deep.
 * (test/data/flymake): Rename to test/lisp/progmodes/flymake-resources.
 * (test/lisp/progmodes/flymake-tests.el): Support renamed resource directory.

3 files changed, 8 insertions, 1 deletions

diff --git a/test/lisp/progmodes/flymake-resources/test.c b/test/lisp/progmodes/flymake-resources/test.c
new file mode 100644
index 00000000000..3a3926131f5
--- /dev/null
+++ b/test/lisp/progmodes/flymake-resources/test.c
@@ -0,0 +1,5 @@
+int main()
+{
+  char c = 1000;
+  return c;
+}
diff --git a/test/lisp/progmodes/flymake-resources/test.pl b/test/lisp/progmodes/flymake-resources/test.pl
new file mode 100644
index 00000000000..d5abcb47e7f
--- /dev/null
+++ b/test/lisp/progmodes/flymake-resources/test.pl
@@ -0,0 +1,2 @@
+@arr = [1,2,3,4];
+my $b = @arr[1];
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 11231bc3f7a..1d8c12c0655 100644
--- a/test/lisp/progmodes/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.")