Update range statements for iterations to be simpler.
Change from "range(1, iterations+1)" to "range(iterations)"
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@387 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/bonnie/bonnie.py b/client/tests/bonnie/bonnie.py
index a4247f0..7ef2b9f 100755
--- a/client/tests/bonnie/bonnie.py
+++ b/client/tests/bonnie/bonnie.py
@@ -17,7 +17,7 @@
def execute(self, iterations = 1, extra_args = '', user = 'root'):
args = '-d ' + self.tmpdir + ' -u ' + user + ' ' + extra_args
- for i in range(1, iterations+1):
+ for i in range(iterations):
system(self.srcdir + '/bonnie++ ' + args)
# Do a profiling run if necessary
diff --git a/client/tests/dbench/dbench.py b/client/tests/dbench/dbench.py
index f5a0ef8..f1ea230 100755
--- a/client/tests/dbench/dbench.py
+++ b/client/tests/dbench/dbench.py
@@ -14,7 +14,7 @@
system('make')
def execute(self, iterations = 1, nprocs = count_cpus(), args = ''):
- for i in range(1, iterations+1):
+ for i in range(iterations):
args = args + ' -c '+self.srcdir+'/client.txt'
args += ' %s' % nprocs
system(self.srcdir + '/dbench ' + args)
diff --git a/client/tests/fs_mark/fs_mark.py b/client/tests/fs_mark/fs_mark.py
index 29fb419..5185730 100644
--- a/client/tests/fs_mark/fs_mark.py
+++ b/client/tests/fs_mark/fs_mark.py
@@ -17,7 +17,7 @@
if not args:
# Just provide a sample run parameters
args = '-s 10240 -n 1000'
- for i in range(1, iterations+1):
+ for i in range(iterations):
system('./fs_mark -d %s %s' %(dir, args))
# Do a profiling run if necessary
diff --git a/client/tests/fsfuzzer/fsfuzzer.py b/client/tests/fsfuzzer/fsfuzzer.py
index f996b2c..3d43f97 100755
--- a/client/tests/fsfuzzer/fsfuzzer.py
+++ b/client/tests/fsfuzzer/fsfuzzer.py
@@ -13,7 +13,7 @@
system('make')
def execute(self, iterations = 1, fstype = 'iso9660'):
- for i in range(1, iterations+1):
+ for i in range(iterations):
args = fstype + ' 1'
system(self.srcdir + '/run_test ' + args)
diff --git a/client/tests/interbench/interbench.py b/client/tests/interbench/interbench.py
index bcad9b5..4da660d 100644
--- a/client/tests/interbench/interbench.py
+++ b/client/tests/interbench/interbench.py
@@ -16,7 +16,7 @@
os.chdir(self.tmpdir)
args += " -c"
- for i in range(1, iterations+1):
+ for i in range(iterations):
system("%s/interbench -m 'run #%s' %s" % \
(self.srcdir, i, args))
diff --git a/client/tests/kernbench/kernbench.py b/client/tests/kernbench/kernbench.py
index d98d4d5..6e73a49 100755
--- a/client/tests/kernbench/kernbench.py
+++ b/client/tests/kernbench/kernbench.py
@@ -21,7 +21,7 @@
print "kernbench x %d: %d threads" % (iterations, threads)
kernel.build_timed(threads) # warmup run
- for i in range(1, iterations+1):
+ for i in range(iterations):
logfile = self.resultsdir+'/time.%d' % i
kernel.build_timed(threads, logfile)
diff --git a/client/tests/lmbench/lmbench.py b/client/tests/lmbench/lmbench.py
index 452acae..44858de 100755
--- a/client/tests/lmbench/lmbench.py
+++ b/client/tests/lmbench/lmbench.py
@@ -28,7 +28,7 @@
os.chdir(self.srcdir)
cmd = "yes '' | make rerun"
- for i in range(1, iterations+1):
+ for i in range(iterations):
system(cmd)
# Do a profiling run if necessary
diff --git a/client/tests/reaim/reaim.py b/client/tests/reaim/reaim.py
index 452b046..7760e09 100755
--- a/client/tests/reaim/reaim.py
+++ b/client/tests/reaim/reaim.py
@@ -55,7 +55,7 @@
print os.getcwd()
cmd = self.ldlib + ' ./reaim ' + args + ' ' + extra_args
- for i in range(1, iterations+1):
+ for i in range(iterations):
system(cmd)
# Do a profiling run if necessary
diff --git a/client/tests/scrashme/scrashme.py b/client/tests/scrashme/scrashme.py
index d01f869..75082b9 100644
--- a/client/tests/scrashme/scrashme.py
+++ b/client/tests/scrashme/scrashme.py
@@ -18,7 +18,7 @@
else:
args = '-c100 -z'
- for i in range(1, iterations+1):
+ for i in range(iterations):
system(self.srcdir + '/scrashme ' + args)
# Do a profiling run if necessary
diff --git a/client/tests/stress/stress.py b/client/tests/stress/stress.py
index dbeaee1..0111f5c 100644
--- a/client/tests/stress/stress.py
+++ b/client/tests/stress/stress.py
@@ -20,7 +20,7 @@
args = '-c %d -i %d -m %d -d %d -t 60 -v' % \
(threads, threads, threads, threads)
- for i in range(1, iterations+1):
+ for i in range(iterations):
system(self.srcdir + '/src/stress ' + args)
# Do a profiling run if necessary
diff --git a/client/tests/tbench/tbench.py b/client/tests/tbench/tbench.py
index 0fe1d8c..1ef0609 100755
--- a/client/tests/tbench/tbench.py
+++ b/client/tests/tbench/tbench.py
@@ -16,7 +16,7 @@
def execute(self, iterations = 1, args = '1'):
# only supports combined server+client model at the moment
# should support separate I suppose, but nobody uses it
- for i in range(1, iterations+1):
+ for i in range(iterations):
self.run_tbench(args)
# Do a profiling run if necessary
diff --git a/client/tests/unixbench/unixbench.py b/client/tests/unixbench/unixbench.py
index 10c3d9e..8d42637 100755
--- a/client/tests/unixbench/unixbench.py
+++ b/client/tests/unixbench/unixbench.py
@@ -13,7 +13,7 @@
system('make')
def execute(self, iterations = 1, args = ''):
- for i in range(1, iterations+1):
+ for i in range(iterations):
os.chdir(self.srcdir)
vars = 'TMPDIR=\"%s\" RESULTDIR=\"%s\"' % (self.tmpdir, self.resultsdir)
system(vars + ' ./Run ' + args)