提交 df80282d 编写于 作者: E Eric Blake

tests: reduce length of nodeinfodata test names

Commit ddd6bef4 switched to the ustar format to fix an issue where
'make dist' fails to create a tarball because we have files with
relative names longer than 100 bytes by the time you include a
'libvirt-0.9.13' prefix.  Unfortunately, even with ustar format,
the use of 'tar -ch' tries to convert symlinks to hard links,
also with a name too long (omitting the -h works, but automake
automatically passes -h); such symlinks were added in commit
6dcf98c8, which resulted in 'make dist' breaking again.  The
solution is to rename the offending symlinks to something shorter,
by shortening the entire nodeinfodata naming scheme.

* tests/nodeinfotest.c (mymain): Shorten test names.
(linuxTestNodeInfo): Accommodate new names.
* tests/nodeinfodata/*: Rename files accordingly.
上级 a22a36e8
...@@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data) ...@@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data)
if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s", if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
abs_srcdir, test) < 0 || abs_srcdir, test) < 0 ||
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo", virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
abs_srcdir, test, arch) < 0 || abs_srcdir, arch, test) < 0 ||
virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt", virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
abs_srcdir, test, arch) < 0) { abs_srcdir, arch, test) < 0) {
goto cleanup; goto cleanup;
} }
...@@ -123,14 +123,14 @@ mymain(void) ...@@ -123,14 +123,14 @@ mymain(void)
int ret = 0; int ret = 0;
int i; int i;
const char *nodeData[] = { const char *nodeData[] = {
"nodeinfo-sysfs-test-1", "test1",
# if !(defined(__powerpc__) || \ # if !(defined(__powerpc__) || \
defined(__powerpc64__)) defined(__powerpc64__))
"nodeinfo-sysfs-test-2", "test2",
"nodeinfo-sysfs-test-3", "test3",
"nodeinfo-sysfs-test-4", "test4",
"nodeinfo-sysfs-test-5", "test5",
"nodeinfo-sysfs-test-6", "test6",
# endif # endif
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册