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);
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);
}
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"));
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);