summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-04-05 10:03:28 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-04-05 10:03:28 +0200
commitdbf9c4209352f355a67a8400aab1659272c80703 (patch)
tree002b3141a47bf8ce0581ecbc6a5349fe62b40574 /scripts/Util.py
parentFix (ICE-7742) - Ice/faultTolerance Python 3.6 crash when using pip packages (diff)
downloadice-dbf9c4209352f355a67a8400aab1659272c80703.tar.bz2
ice-dbf9c4209352f355a67a8400aab1659272c80703.tar.xz
ice-dbf9c4209352f355a67a8400aab1659272c80703.zip
Fixed C++/Objective-C controllerApp projects to no longer reference armv7, removed obsolete testSuiteApp
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py19
1 files changed, 1 insertions, 18 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 6ef6c2b7c7f..46cf82518da 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -954,20 +954,6 @@ class Process(Runnable):
return str(self.__class__)
return self.exe + (" ({0})".format(self.desc) if self.desc else "")
- def setup(self, current):
- if current.driver.appverifier:
- exe = process.getCommandLine(current)
- run("appverif --enable * -for " + exe)
- run("appverif -disable LuaPriv PrintDriver PrintApi Networking HighVersionLie -for " + exe)
-
- def teardown(self, current, success):
- if current.driver.appverifier:
- exe = process.getCommandLine(current)
- log = os.path.join(current.testcase.getPath(), os.path.basename(exe) + "_appverif.xml")
- run("appverif -export log -for " + exe + " -with To=" + log)
- run("appverif -delete logs -for " + exe)
- run("appverif -delete settings -for " + exe)
-
def getOutput(self, current, encoding="utf-8"):
assert(self in current.processes)
@@ -1726,7 +1712,6 @@ class LocalProcessController(ProcessController):
if current.driver.valgrind:
cmd += "valgrind -q --child-silent-after-fork=yes --leak-check=full --suppressions=\"{0}\" ".format(
os.path.join(toplevel, "config", "valgrind.sup"))
-
cmd += (process.getCommandLine(current) + (" " + " ".join(args) if len(args) > 0 else "")).format(**kargs)
if current.driver.debug:
if len(envs) > 0:
@@ -2261,7 +2246,7 @@ class Driver:
@classmethod
def getSupportedArgs(self):
return ("dlrR", ["debug", "driver=", "filter=", "rfilter=", "host=", "host-ipv6=", "host-bt=", "interface=",
- "controller-app", "valgrind", "appverifier"])
+ "controller-app", "valgrind"])
@classmethod
def usage(self):
@@ -2281,7 +2266,6 @@ class Driver:
print("--interface=<IP> The multicast interface to use to discover controllers.")
print("--controller-app Start the process controller application.")
print("--valgrind Start executables with valgrind.")
- print("--appverifier Start executables with Application Verifier.")
def __init__(self, options):
self.debug = False
@@ -2292,7 +2276,6 @@ class Driver:
self.hostBT = ""
self.controllerApp = False
self.valgrind = False
- self.appverifier = False
self.failures = []
parseOptions(self, options, { "d": "debug",