Re-enable valgrind for all tests

Now we can handle duplicated messages due to the peer re-sending (due to us
being soooo slow with valgrind)
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-03 13:11:08 +02:00 committed by Paul Bakker
parent 1aa586e41d
commit 0a65934ef3

View File

@ -95,15 +95,6 @@ requires_gnutls() {
fi fi
} }
# skip next test if valgrind is in use (temporary)
not_with_valgrind() {
if [ $MEMCHECK -gt 0 ]; then
SKIP_NEXT="YES"
else
SKIP_NEXT="NO"
fi
}
# skip next test if IPv6 isn't available on this host # skip next test if IPv6 isn't available on this host
requires_ipv6() { requires_ipv6() {
if [ -z "${HAS_IPV6:-}" ]; then if [ -z "${HAS_IPV6:-}" ]; then
@ -891,7 +882,6 @@ run_test "Renegotiation: DTLS, server-initiated" \
-s "=> renegotiate" \ -s "=> renegotiate" \
-s "write hello request" -s "write hello request"
not_with_valgrind
run_test "Renegotiation: DTLS, gnutls server, client-initiated" \ run_test "Renegotiation: DTLS, gnutls server, client-initiated" \
"$G_SRV -u --mtu 4096" \ "$G_SRV -u --mtu 4096" \
"$P_CLI debug_level=3 dtls=1 exchanges=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 dtls=1 exchanges=1 renegotiation=1 renegotiate=1" \
@ -1971,7 +1961,6 @@ run_test "DTLS cookie: enabled, IPv6" \
# Tests for receiving fragmented handshake messages with DTLS # Tests for receiving fragmented handshake messages with DTLS
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: no fragmentation (gnutls server)" \ run_test "DTLS reassembly: no fragmentation (gnutls server)" \
"$G_SRV -u --mtu 2048 -a" \ "$G_SRV -u --mtu 2048 -a" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -1980,7 +1969,6 @@ run_test "DTLS reassembly: no fragmentation (gnutls server)" \
-C "error" -C "error"
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: some fragmentation (gnutls server)" \ run_test "DTLS reassembly: some fragmentation (gnutls server)" \
"$G_SRV -u --mtu 512" \ "$G_SRV -u --mtu 512" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -1989,7 +1977,6 @@ run_test "DTLS reassembly: some fragmentation (gnutls server)" \
-C "error" -C "error"
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: more fragmentation (gnutls server)" \ run_test "DTLS reassembly: more fragmentation (gnutls server)" \
"$G_SRV -u --mtu 128" \ "$G_SRV -u --mtu 128" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -1998,7 +1985,6 @@ run_test "DTLS reassembly: more fragmentation (gnutls server)" \
-C "error" -C "error"
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: more fragmentation, nbio (gnutls server)" \ run_test "DTLS reassembly: more fragmentation, nbio (gnutls server)" \
"$G_SRV -u --mtu 128" \ "$G_SRV -u --mtu 128" \
"$P_CLI dtls=1 nbio=2 debug_level=2" \ "$P_CLI dtls=1 nbio=2 debug_level=2" \
@ -2007,7 +1993,6 @@ run_test "DTLS reassembly: more fragmentation, nbio (gnutls server)" \
-C "error" -C "error"
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: fragmentation, renego (gnutls server)" \ run_test "DTLS reassembly: fragmentation, renego (gnutls server)" \
"$G_SRV -u --mtu 256" \ "$G_SRV -u --mtu 256" \
"$P_CLI debug_level=3 dtls=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 dtls=1 renegotiation=1 renegotiate=1" \
@ -2021,7 +2006,6 @@ run_test "DTLS reassembly: fragmentation, renego (gnutls server)" \
-s "Extra-header:" -s "Extra-header:"
requires_gnutls requires_gnutls
not_with_valgrind
run_test "DTLS reassembly: fragmentation, nbio, renego (gnutls server)" \ run_test "DTLS reassembly: fragmentation, nbio, renego (gnutls server)" \
"$G_SRV -u --mtu 256" \ "$G_SRV -u --mtu 256" \
"$P_CLI debug_level=3 nbio=2 dtls=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 nbio=2 dtls=1 renegotiation=1 renegotiate=1" \
@ -2034,7 +2018,6 @@ run_test "DTLS reassembly: fragmentation, nbio, renego (gnutls server)" \
-C "error" \ -C "error" \
-s "Extra-header:" -s "Extra-header:"
not_with_valgrind
run_test "DTLS reassembly: no fragmentation (openssl server)" \ run_test "DTLS reassembly: no fragmentation (openssl server)" \
"$O_SRV -dtls1 -mtu 2048" \ "$O_SRV -dtls1 -mtu 2048" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -2042,7 +2025,6 @@ run_test "DTLS reassembly: no fragmentation (openssl server)" \
-C "found fragmented DTLS handshake message" \ -C "found fragmented DTLS handshake message" \
-C "error" -C "error"
not_with_valgrind
run_test "DTLS reassembly: fragmentation (openssl server)" \ run_test "DTLS reassembly: fragmentation (openssl server)" \
"$O_SRV -dtls1 -mtu 256" \ "$O_SRV -dtls1 -mtu 256" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -2050,7 +2032,6 @@ run_test "DTLS reassembly: fragmentation (openssl server)" \
-c "found fragmented DTLS handshake message" \ -c "found fragmented DTLS handshake message" \
-C "error" -C "error"
not_with_valgrind
run_test "DTLS reassembly: fragmentation (openssl server)" \ run_test "DTLS reassembly: fragmentation (openssl server)" \
"$O_SRV -dtls1 -mtu 256" \ "$O_SRV -dtls1 -mtu 256" \
"$P_CLI dtls=1 debug_level=2" \ "$P_CLI dtls=1 debug_level=2" \
@ -2058,7 +2039,6 @@ run_test "DTLS reassembly: fragmentation (openssl server)" \
-c "found fragmented DTLS handshake message" \ -c "found fragmented DTLS handshake message" \
-C "error" -C "error"
not_with_valgrind
run_test "DTLS reassembly: fragmentation, nbio (openssl server)" \ run_test "DTLS reassembly: fragmentation, nbio (openssl server)" \
"$O_SRV -dtls1 -mtu 256" \ "$O_SRV -dtls1 -mtu 256" \
"$P_CLI dtls=1 nbio=2 debug_level=2" \ "$P_CLI dtls=1 nbio=2 debug_level=2" \