Thu Jul 23 11:05:34 2015 UTC ()
Reflect a fix for bridge

Due to PR 48104, some tests of ping/ping6 were failed but the tests now
should be successful. So reverse atf_check.

Bonus: the fix for PR 48104 also fixes another uknown failure.


(ozaki-r)
diff -r1.9 -r1.10 src/tests/net/if_bridge/t_bridge.sh
cvs diff -r1.9 -r1.10 src/tests/net/if_bridge/t_bridge.sh (expand / switch to unified diff)

--- src/tests/net/if_bridge/t_bridge.sh 2015/06/10 03:29:37 1.9
+++ src/tests/net/if_bridge/t_bridge.sh 2015/07/23 11:05:34 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: t_bridge.sh,v 1.9 2015/06/10 03:29:37 ozaki-r Exp $ 1# $NetBSD: t_bridge.sh,v 1.10 2015/07/23 11:05:34 ozaki-r Exp $
2# 2#
3# Copyright (c) 2014 The NetBSD Foundation, Inc. 3# Copyright (c) 2014 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# Redistribution and use in source and binary forms, with or without 6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions 7# modification, are permitted provided that the following conditions
8# are met: 8# are met:
9# 1. Redistributions of source code must retain the above copyright 9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer. 10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright 11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the 12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution. 13# documentation and/or other materials provided with the distribution.
14# 14#
@@ -309,57 +309,56 @@ test_ping6_success() @@ -309,57 +309,56 @@ test_ping6_success()
309 rump.ifconfig -v shmif0 309 rump.ifconfig -v shmif0
310 export LD_PRELOAD=/usr/lib/librumphijack.so 310 export LD_PRELOAD=/usr/lib/librumphijack.so
311 atf_check -s exit:0 -o ignore ping6 -q -n -c 1 -X $TIMEOUT $IP61 311 atf_check -s exit:0 -o ignore ping6 -q -n -c 1 -X $TIMEOUT $IP61
312 unset LD_PRELOAD 312 unset LD_PRELOAD
313 rump.ifconfig -v shmif0 313 rump.ifconfig -v shmif0
314} 314}
315 315
316test_ping_member() 316test_ping_member()
317{ 317{
318 export RUMP_SERVER=$SOCK1 318 export RUMP_SERVER=$SOCK1
319 rump.ifconfig -v shmif0 319 rump.ifconfig -v shmif0
320 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1 320 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1
321 rump.ifconfig -v shmif0 321 rump.ifconfig -v shmif0
322 # It's known to fail. See PR#48104 322 # Test for PR#48104
323 atf_check -s not-exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2 323 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2
324 rump.ifconfig -v shmif0 324 rump.ifconfig -v shmif0
325 325
326 export RUMP_SERVER=$SOCK3 326 export RUMP_SERVER=$SOCK3
327 rump.ifconfig -v shmif0 327 rump.ifconfig -v shmif0
328 # It's known to fail. See PR#48104 328 # Test for PR#48104
329 atf_check -s not-exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1 329 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1
330 rump.ifconfig -v shmif0 330 rump.ifconfig -v shmif0
331 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2 331 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2
332 rump.ifconfig -v shmif0 332 rump.ifconfig -v shmif0
333} 333}
334 334
335test_ping6_member() 335test_ping6_member()
336{ 336{
337 export LD_PRELOAD=/usr/lib/librumphijack.so 337 export LD_PRELOAD=/usr/lib/librumphijack.so
338 338
339 export RUMP_SERVER=$SOCK1 339 export RUMP_SERVER=$SOCK1
340 rump.ifconfig -v shmif0 340 rump.ifconfig -v shmif0
341 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1 341 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1
342 rump.ifconfig -v shmif0 342 rump.ifconfig -v shmif0
343 # It's known to fail. See PR#48104 343 # Test for PR#48104
344 atf_check -s not-exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2 344 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2
345 rump.ifconfig -v shmif0 345 rump.ifconfig -v shmif0
346 346
347 export RUMP_SERVER=$SOCK3 347 export RUMP_SERVER=$SOCK3
348 rump.ifconfig -v shmif0 348 rump.ifconfig -v shmif0
349 # It's known to fail. See PR#48104 349 # Test for PR#48104
350 atf_check -s not-exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1 350 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1
351 rump.ifconfig -v shmif0 351 rump.ifconfig -v shmif0
352 # FIXME: it doesn't work for some reason 
353 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2 352 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2
354 rump.ifconfig -v shmif0 353 rump.ifconfig -v shmif0
355 354
356 unset LD_PRELOAD 355 unset LD_PRELOAD
357} 356}
358 357
359get_number_of_caches() 358get_number_of_caches()
360{ 359{
361 export RUMP_SERVER=$SOCK2 360 export RUMP_SERVER=$SOCK2
362 export LD_PRELOAD=/usr/lib/librumphijack.so 361 export LD_PRELOAD=/usr/lib/librumphijack.so
363 echo $(($(/sbin/brconfig bridge0 |grep -A 100 "Address cache" |wc -l) - 1)) 362 echo $(($(/sbin/brconfig bridge0 |grep -A 100 "Address cache" |wc -l) - 1))
364 unset LD_PRELOAD 363 unset LD_PRELOAD
365} 364}