summaryrefslogtreecommitdiff
path: root/perf/config/TestUtil.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2006-07-27 17:23:26 +0000
committerBrent Eagles <brent@zeroc.com>2006-07-27 17:23:26 +0000
commitc22c214d90cb0fd858233ba79c02bdc282a554af (patch)
treedbbe14ae1f8cab2d4e79d7e63904dff5db26863f /perf/config/TestUtil.py
parent["nonmutating"] support (diff)
downloadice-c22c214d90cb0fd858233ba79c02bdc282a554af.tar.bz2
ice-c22c214d90cb0fd858233ba79c02bdc282a554af.tar.xz
ice-c22c214d90cb0fd858233ba79c02bdc282a554af.zip
- Some code cleanup.
- Renamed files that were implementation specific to more closely align with Ice file naming rules. - Changed dependencies so that they refer to environment variables instead of relative or absolute directories specific to the platform that the dependencies were generated on. - Added file headers (still need to double check for missing ones) - Removed CVS generated comments from cut-n-paste coding from TAO demos, etc. - Added a Make.tao.rules file to consolidate TAO build specific options, similar to those being use by the IceE and Ice test programs. - Changed the runIcePerf.py script to use external tables of test descriptions and a loop instead of using hand coded repeated function calls. This makes regular expression a little more intuitive. (It was originally done to make it easier to remove the omniORB tests from the distribution, but that was later deemed unnecessary, I like it better anyway). - Updated code to remove APIs that were deprecated in Ice 3.1 and the next revision of IceE ... err. that might've been a mistake , since we haven't released the new IceE yet.
Diffstat (limited to 'perf/config/TestUtil.py')
-rw-r--r--perf/config/TestUtil.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/perf/config/TestUtil.py b/perf/config/TestUtil.py
index 95c766222f5..f1776aaf119 100644
--- a/perf/config/TestUtil.py
+++ b/perf/config/TestUtil.py
@@ -10,6 +10,9 @@
import os, sys, pickle, platform
+#
+# XXX Why do we need to do this?
+#
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
toplevel = os.path.normpath(toplevel)
if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
@@ -294,6 +297,13 @@ class AllResults :
def printAllAsCsv(self, results, tests, names, hosts, products):
+ #
+ # TODO: CSV's are occasionally imported into databases and
+ # spreadsheets. It would be better to have the CSV form more
+ # closely follow a raw table form then to break it up into
+ # groups.
+ #
+
print "Test, Configuration, ",
for product in products:
for host in hosts:
@@ -390,8 +400,7 @@ class AllResults :
class Test :
- def __init__(self, expr, results, i, product, test, directory = ""):
- self.expr = expr
+ def __init__(self, results, i, product, test, directory = ""):
self.results = results
self.iteration = i
self.product = product
@@ -403,15 +412,6 @@ class Test :
def run(self, name, options):
- match = len(self.expr) == 0
- for e in self.expr:
- if e.match(self.product + " " + self.test + " " + name):
- match = True
- break;
-
- if not match:
- return
-
print str(self.iteration) + ": " + self.product + " " + self.test + " " + name + "...",
sys.stdout.flush()