From 059c1842ef35aa6e2eb33230a228edb12ecd8852 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 12 Jul 2012 12:02:19 +0100
Subject: [PATCH] Move test data files to test/data/keymaps

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---
 test/data/{ => keymaps}/bad.xkb                     | 0
 test/data/{ => keymaps}/basic.xkb                   | 0
 test/data/{ => keymaps}/comprehensive-plus-geom.xkb | 0
 test/data/{ => keymaps}/default.xkb                 | 0
 test/data/{ => keymaps}/dump.data                   | 0
 test/{ => data/keymaps}/stringcomp.data             | 0
 test/dump.c                                         | 2 +-
 test/filecomp.c                                     | 9 +++++----
 test/stringcomp.c                                   | 2 +-
 9 files changed, 7 insertions(+), 6 deletions(-)
 rename test/data/{ => keymaps}/bad.xkb (100%)
 rename test/data/{ => keymaps}/basic.xkb (100%)
 rename test/data/{ => keymaps}/comprehensive-plus-geom.xkb (100%)
 rename test/data/{ => keymaps}/default.xkb (100%)
 rename test/data/{ => keymaps}/dump.data (100%)
 rename test/{ => data/keymaps}/stringcomp.data (100%)

diff --git a/test/data/bad.xkb b/test/data/keymaps/bad.xkb
similarity index 100%
rename from test/data/bad.xkb
rename to test/data/keymaps/bad.xkb
diff --git a/test/data/basic.xkb b/test/data/keymaps/basic.xkb
similarity index 100%
rename from test/data/basic.xkb
rename to test/data/keymaps/basic.xkb
diff --git a/test/data/comprehensive-plus-geom.xkb b/test/data/keymaps/comprehensive-plus-geom.xkb
similarity index 100%
rename from test/data/comprehensive-plus-geom.xkb
rename to test/data/keymaps/comprehensive-plus-geom.xkb
diff --git a/test/data/default.xkb b/test/data/keymaps/default.xkb
similarity index 100%
rename from test/data/default.xkb
rename to test/data/keymaps/default.xkb
diff --git a/test/data/dump.data b/test/data/keymaps/dump.data
similarity index 100%
rename from test/data/dump.data
rename to test/data/keymaps/dump.data
diff --git a/test/stringcomp.data b/test/data/keymaps/stringcomp.data
similarity index 100%
rename from test/stringcomp.data
rename to test/data/keymaps/stringcomp.data
diff --git a/test/dump.c b/test/dump.c
index eaa7adb..3fe3b42 100644
--- a/test/dump.c
+++ b/test/dump.c
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     int fd;
 
     srcdir = srcdir ? srcdir : ".";
-    assert(asprintf(&path, "%s/test/data/dump.data", srcdir) != -1);
+    assert(asprintf(&path, "%s/test/data/keymaps/dump.data", srcdir) != -1);
     fd = open(path, O_RDONLY);
     assert(fd >= 0);
     assert(stat(path, &stat_buf) == 0);
diff --git a/test/filecomp.c b/test/filecomp.c
index 7f140f5..a91d24a 100644
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -68,7 +68,8 @@ test_file_name(const char *file_name)
     static char path[PATH_MAX];
     const char *srcdir = getenv("srcdir");
 
-    snprintf(path, PATH_MAX - 1, "%s/test/data/%s", srcdir ? srcdir : ".", file_name);
+    snprintf(path, PATH_MAX - 1,
+             "%s/test/data/keymaps/%s", srcdir ? srcdir : ".", file_name);
     return test_file(path);
 }
 
@@ -98,10 +99,10 @@ int
 main(void)
 {
 
-    assert(test_file_name("basic.xkb"));
+    assert(test_file_name("keymaps/basic.xkb"));
     /* XXX check we actually get qwertz here ... */
-    assert(test_file_name("default.xkb"));
-    assert(test_file_name("comprehensive-plus-geom.xkb"));
+    assert(test_file_name("keymaps/default.xkb"));
+    assert(test_file_name("keymaps/comprehensive-plus-geom.xkb"));
 
     assert(!test_file_name("bad.xkb"));
 
diff --git a/test/stringcomp.c b/test/stringcomp.c
index a079346..8db7836 100644
--- a/test/stringcomp.c
+++ b/test/stringcomp.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
     srcdir = getenv("srcdir");
     assert(srcdir);
-    assert(asprintf(&path, "%s/test/stringcomp.data", srcdir) > 0);
+    assert(asprintf(&path, "%s/test/data/keymaps/stringcomp.data", srcdir) > 0);
     assert(path);
 
     fd = open(path, O_RDONLY);
-- 
2.7.4