| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | # $NetBSD: t_ipsec_misc.sh,v 1.23 2019/07/23 04:31:25 ozaki-r Exp $ | | 1 | # $NetBSD: t_ipsec_misc.sh,v 1.24 2020/08/31 14:03:56 martin Exp $ |
| 2 | # | | 2 | # |
| 3 | # Copyright (c) 2017 Internet Initiative Japan Inc. | | 3 | # Copyright (c) 2017 Internet Initiative Japan 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 | # |
| @@ -555,26 +555,30 @@ test_spi() | | | @@ -555,26 +555,30 @@ test_spi() |
| 555 | { | | 555 | { |
| 556 | local proto=$1 | | 556 | local proto=$1 |
| 557 | local algo=$2 | | 557 | local algo=$2 |
| 558 | local preferred=$3 | | 558 | local preferred=$3 |
| 559 | local method=$4 | | 559 | local method=$4 |
| 560 | local ip_local=10.0.0.1 | | 560 | local ip_local=10.0.0.1 |
| 561 | local ip_peer=10.0.0.2 | | 561 | local ip_peer=10.0.0.2 |
| 562 | local algo_args="$(generate_algo_args $proto $algo)" | | 562 | local algo_args="$(generate_algo_args $proto $algo)" |
| 563 | local proto_cap=$(echo $proto | tr 'a-z' 'A-Z') | | 563 | local proto_cap=$(echo $proto | tr 'a-z' 'A-Z') |
| 564 | local outfile=./out | | 564 | local outfile=./out |
| 565 | local spistr= | | 565 | local spistr= |
| 566 | local longtime= shorttime= | | 566 | local longtime= shorttime= |
| 567 | | | 567 | |
| | | 568 | if [ $method = timeout ]; then |
| | | 569 | atf_skip \ |
| | | 570 | "PR 55632: test fails randomly, leaving spurious rump_server around" |
| | | 571 | fi |
| 568 | if [ $method = timeout -a $preferred = new ]; then | | 572 | if [ $method = timeout -a $preferred = new ]; then |
| 569 | skip_if_qemu | | 573 | skip_if_qemu |
| 570 | fi | | 574 | fi |
| 571 | | | 575 | |
| 572 | if [ $method = delete ]; then | | 576 | if [ $method = delete ]; then |
| 573 | shorttime=100 | | 577 | shorttime=100 |
| 574 | longtime=100 | | 578 | longtime=100 |
| 575 | else | | 579 | else |
| 576 | shorttime=3 | | 580 | shorttime=3 |
| 577 | longtime=6 | | 581 | longtime=6 |
| 578 | fi | | 582 | fi |
| 579 | | | 583 | |
| 580 | rump_server_crypto_start $SOCK_LOCAL netipsec | | 584 | rump_server_crypto_start $SOCK_LOCAL netipsec |