I already updated the netperf package to 2.6.0, this patch updated the config file and file path.
wait_before_data.patch is no longer requested. Signed-off-by: Amos Kong <[email protected]> --- shared/cfg/subtests.cfg.sample | 20 ++++++++++---------- tests/netperf.py | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shared/cfg/subtests.cfg.sample b/shared/cfg/subtests.cfg.sample index 42cf453..0f3f17a 100644 --- a/shared/cfg/subtests.cfg.sample +++ b/shared/cfg/subtests.cfg.sample @@ -2362,8 +2362,8 @@ variants: nic_model_nic1 = virtio # bridge_nic2 = switch nic_model_nic2 = e1000 - netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch - setup_cmd = "cd /tmp && rm -rf netperf-2.4.5 && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure --enable-burst && make" + netperf_files = netperf-2.6.0.tar.bz2 + setup_cmd = "cd /tmp && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst && make" # configure netperf test parameters l = 60 protocols = "TCP_STREAM TCP_MAERTS TCP_RR" @@ -2408,8 +2408,8 @@ variants: pci_model_nic2 = e1000 nics += ' nic2' nic_mode = tap - netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch - setup_cmd = "cd /tmp && rm -rf netperf-2.4.5 && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure --enable-burst && make" + netperf_files = netperf-2.6.0.tar.bz2 + setup_cmd = "cd /tmp && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst && make" guest_ver_cmd = "ver" netperf_with_numa = yes # configure netperf test parameters @@ -2454,12 +2454,12 @@ variants: config_cmds += ,disable_tcp_heuristics_cmd,disabled_tcp_autotuning_cmd,enable_ctcp_cmd - netperf_cygwin: use_cygwin = yes - netperf_src = D:\netperf\netperf-2.4.5 + netperf_src = D:\netperf\netperf-2.6.0 cygwin_root = C:\rhcygwin\home\Administrator cygwin_start = C:\rhcygwin\Cygwin.bat -i /Cygwin-Terminal.ico - netserv_pattern = "hostname\s+[\d+\.]+\s+port\s+\d+" netserv_start_cmd = netserver - netperf_install_cmd = cd netperf-2.4.5; ./configure --enable-burst; make; make install + netperf_install_cmd = cd netperf-2.6.0; ./configure --enable-burst; make; make install - ntttcp: virt_test_type = kvm libvirt @@ -2526,12 +2526,12 @@ variants: mode = driver -load: mode = load - netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch + netperf_files = netperf-2.6.0.tar.bz2 packet_size = 1500 - setup_cmd = "cd %s && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure && make" + setup_cmd = "cd %s && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure && make" clean_cmd = " while killall -9 netserver; do True test; done;" - netserver_cmd = %s/netperf-2.4.5/src/netserver - netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m %s + netserver_cmd = %s/netperf-2.6.0/src/netserver + netperf_cmd = %s/netperf-2.6.0/src/netperf -t %s -H %s -l 60 -- -m %s - physical_resources_check: install setup image_copy unattended_install.cdrom virt_test_type = kvm diff --git a/tests/netperf.py b/tests/netperf.py index 2a9aa74..e0cbd89 100644 --- a/tests/netperf.py +++ b/tests/netperf.py @@ -370,8 +370,8 @@ def launch_client(sessions, server, server_ctl, host, client, l, nf_args, port, params, server_cyg): """ Launch netperf clients """ - client_path = "/tmp/netperf-2.4.5/src/netperf" - server_path = "/tmp/netperf-2.4.5/src/netserver" + client_path = "/tmp/netperf-2.6.0/src/netperf" + server_path = "/tmp/netperf-2.6.0/src/netserver" # Start netserver if params.get("os_type") == "windows": timeout = float(params.get("timeout", "240")) -- 1.7.1 _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
