[lnst] TestIperf: do not download and compile anything and use installed iperf

[Jiří Pírko]

commit d72ae2a2ce245446bb6f3319ba7d0876920ed744
Author: Jiri Pirko <jiri(a)resnulli.us&gt;
Date:   Wed Sep 19 11:28:50 2012 +0200

    TestIperf: do not download and compile anything and use installed iperf
    
    Signed-off-by: Jiri Pirko <jiri(a)resnulli.us&gt;

 Tests/TestIperf.py |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/Tests/TestIperf.py b/Tests/TestIperf.py
index 7cb6663..e928702 100644
--- a/Tests/TestIperf.py
+++ b/Tests/TestIperf.py
@@ -15,13 +15,6 @@ import errno
 import re
 
 class TestIperf(TestGeneric):
-    def _install_iperf(self):
-        # by default dies on failure
-        logging.info("trace: _install_iperf")
-        exec_cmd("wget -P %s/ %s" % (self._temp_dir, self._harness_url) )
-        exec_cmd("cd %s; tar -xvzf %s" % (self._temp_dir,
self._harness_archive))
-        exec_cmd("cd %s/%s; ./configure; make; " % (self._temp_dir,
self._harness))
-
     def _compose_iperf_cmd(self, role):
         iperf_options = self.get_opt("iperf_opts")
         if iperf_options is None:
@@ -30,10 +23,10 @@ class TestIperf(TestGeneric):
         cmd = ""
         if role == "client":
             iperf_server = self.get_mopt("iperf_server",
opt_type="addr")
-            cmd = "cd %s/%s/src; ./iperf --%s %s -t %s %s" % (self._temp_dir,
self._harness, role, iperf_server, self.duration, iperf_options)
+            cmd = "iperf --%s %s -t %s %s" % (role, iperf_server,
self.duration, iperf_options)
         elif role == "server":
             bind = self.get_opt("bind", opt_type="addr")
-            cmd = "cd %s/%s/src; ./iperf --%s -B %s %s" % (self._temp_dir,
self._harness, role, bind, iperf_options)
+            cmd = "iperf --%s -B %s %s" % (role, bind, iperf_options)
 
         return cmd
 
@@ -130,9 +123,6 @@ class TestIperf(TestGeneric):
 
     def run(self):
         self._keep_server_running = True
-        self._harness = "iperf-2.0.5"
-        self._harness_archive = self._harness + ".tar.gz"
-        self._harness_url =
"http://sourceforge.net/projects/iperf/files/%s/download" %
self._harness_archive
 
         self.duration = self.get_opt("duration")
         if self.duration is None:
@@ -140,14 +130,6 @@ class TestIperf(TestGeneric):
         else:
             self._keep_server_running = False    # for server purposes
 
-        # same for client and server
-        installed = self.get_opt("install_dir")
-        if installed is None:
-            self._temp_dir = (exec_cmd("mktemp -d")[0]).strip()
-            self._install_iperf()
-        else:
-            self._temp_dir = installed
-
         self.threshold = self.get_opt("threshold")
 
         role = self.get_mopt("role")