提交 a6f05c5a 编写于 作者: M Michal Privoznik

networkxml2conftest: s/lo/lo0/ on non-Linux

After 478ddedc a bug is fixed where we wrongly presumed loopack
device name on non-Linux systems. It's lo0. However, the fix is
not reflected in the tests which are failing now.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 70b0a8e5
......@@ -1065,6 +1065,8 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
*/
/* create dnsmasq config file appropriate for this network */
/* Don't forget to update networkxml2conftest :-) */
virBufferAsprintf(&configbuf,
"##WARNING: THIS IS AN AUTO-GENERATED FILE. "
"CHANGES TO IT ARE LIKELY TO BE\n"
......
......@@ -41,10 +41,22 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
if (dctx == NULL)
goto fail;
if (networkDnsmasqConfContents(obj, pidfile, &actual,
dctx, caps) < 0)
if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
goto fail;
/* Any changes to this function ^^ should be reflected here too. */
#ifndef __linux__
char * tmp;
if (!(tmp = virStringReplace(actual,
"except-interface=lo0\n",
"except-interface=lo\n")))
goto fail;
VIR_FREE(actual);
actual = tmp;
tmp = NULL;
#endif
if (virTestCompareToFile(actual, outconf) < 0)
goto fail;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册