Commit c4ae57e0 authored by Russ Fish's avatar Russ Fish

Windows linktest tweaks.

parent f5849420
......@@ -11,6 +11,14 @@ SUBDIR = event/linktest/iperf
include $(OBJDIR)/Makeconf
SYSTEM := $(patsubst CYGWIN%,CYGWIN,$(shell uname -s))
ifeq ($(SYSTEM),CYGWIN)
# Compile single-threaded on Windows. Otherwise, the client iperf often hangs
# after the first phase of a two-way bandwidth test.
CONFIG_ARGS = --disable-threads
endif
all: src/emulab-iperf
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -35,7 +43,7 @@ client-install: Makefile
# Note: GNU make wants to pass options in MAKEFLAGS (w) that are compatible
# with BSD make. So we just force configure to assume/use gmake for BSD.
config.status:
MAKE=$(MAKE) $(SRCDIR)/iperf-2.0.2/configure
MAKE=$(MAKE) $(SRCDIR)/iperf-2.0.2/configure $(CONFIG_ARGS)
iperf-2.0.2:
$(SRCDIR)/iperf-fetch.sh $(SRCDIR)
......
......@@ -66,6 +66,7 @@ use constant INSIGNIFICANT_LAT_ERROR_LO => 0.50; # ms
use constant INSIGNIFICANT_LAT_ERROR_HI => 3.50; # ms
use constant INSIGNIFICANT_BW_ERROR_HI => 0.01; # percent.
use constant INSIGNIFICANT_BW_ERROR_LO => 0.06; # percent.
use constant INSIGNIFICANT_BW_ERROR_LO_Windows => 0.10; # Lower expectations.
# latency must be corrected for xmit delay under this speed.
use constant LAT_LOW_BW => 10000000;
......@@ -918,7 +919,10 @@ sub bw_test {
}
}
elsif ($bw < $edge->bw) {
if ($diff > ($expected * INSIGNIFICANT_BW_ERROR_LO)) {
if ($diff > ($expected *
(($platform =~ /CYGWIN/) ?
INSIGNIFICANT_BW_ERROR_LO_Windows :
INSIGNIFICANT_BW_ERROR_LO))) {
$error = "lower";
}
}
......
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