[CRIU] [PATCH] zdtm/net/ipv4: fix missed rename

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Thu Apr 21 11:33:44 PDT 2016


dir somehow missed rename that broke test compilation:
gcc -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0  -iquote
../lib/arch/x86/include -I../lib   netns-dev.c ../lib/libzdtmtst.a   -o
netns-dev
In file included from netns-dev.c:5:0:
netns-dev.c: In function ‘check_and_restore’:
netns-dev.c:138:10: error: ‘struct test_conf’ has no member named ‘dir’
        tc->dir, devconfs4[opt], tc->ipv4_conf_rand[opt], val);
          ^
../lib/zdtmtst.h:120:27: note: in definition of macro ‘fail’
    __FILE__, __LINE__, ## arg, errno, strerror(errno))

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 test/zdtm/static/netns-dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index 5a34358..14c77be 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -135,7 +135,7 @@ static int check_and_restore(int opt, FILE *fp, struct test_conf *tc) {
 
 	if (val != tc->ipv4_conf_rand[opt]) {
 		fail("Option \"%s/%s\" changed from %d to %d",
-		     tc->dir, devconfs4[opt], tc->ipv4_conf_rand[opt], val);
+		     tc->dir4, devconfs4[opt], tc->ipv4_conf_rand[opt], val);
 		return -1;
 	}
 
-- 
2.4.3



More information about the CRIU mailing list