Commit abdea652 authored by Andrei Vagin's avatar Andrei Vagin Committed by Pavel Emelyanov

zdtm/netns: user correct file names for test files

We clean up test files from Makefile.
The name format for them is testname.XXX.test.
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 433839cf
......@@ -351,10 +351,10 @@ cleandep: clean
$(RM) -f $(DEP)
cleanout:
$(RM) -f -r *.pid *.out* *.test* *.state ip.dump ip.rst
$(RM) -f -r *.pid *.out* *.test* *.state
%.cleanout: %
$(Q) $(RM) -f -r $<.pid $<.out* *$<.test* $<.*.test $<.state
$(Q) $(RM) -f -r $<.pid $<.out* *$<.test* $<.*.test $<.state $<.init.pid
realclean: cleandep cleanout
......
......@@ -31,7 +31,8 @@ int main(int argc, char **argv)
return -1;
}
if (system("ip link > ip.dump && ip addr >> ip.dump && ip route >> ip.dump")) {
if (system("ip link > netns.dump.test && ip addr >> netns.dump.test && ip route >> netns.dump.test")) {
sleep(1000);
fail("Can't save net config");
return -1;
}
......@@ -39,12 +40,12 @@ int main(int argc, char **argv)
test_daemon();
test_waitsig();
if (system("ip link > ip.rst && ip addr >> ip.rst && ip route >> ip.rst")) {
if (system("ip link > netns.rst.test && ip addr >> netns.rst.test && ip route >> netns.rst.test")) {
fail("Can't get net config");
return -1;
}
if (system("diff ip.rst ip.dump")) {
if (system("diff netns.rst.test netns.dump.test")) {
fail("Net config differs after restore");
return -1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment