4166 - Investigate appverifier (Added support to run test suite with it)

20 files changed, 159 insertions, 38 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index a18f743e0e5..f7d2f6b0d4f 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -28,7 +28,7 @@ tests = [
     ("IceUtil/thread",  ["once"]),
     ("IceUtil/unicode", ["once"]),
     ("IceUtil/inputUtil",  ["once"]),
-    ("IceUtil/uuid", ["once"]),
+    ("IceUtil/uuid", ["once", "noappverifier"]), # This test is very slow with appverifier.
     ("IceUtil/timer", ["once"]),
     ("Slice/errorDetection", ["once"]),
     ("Slice/keyword", ["once"]),
@@ -63,16 +63,16 @@ tests = [
     ("Freeze/dbmap", ["once", "novc6"]),
     ("Freeze/complex", ["once", "novc6"]),
     ("Freeze/evictor", ["core", "novc6"]),
-    ("IceStorm/single", ["service", "novc6"]),
+    ("IceStorm/single", ["service", "novc6", "noappverifier"]),  # This test doensn't work with appverifier is sensitive to timeouts.
     ("IceStorm/federation", ["service", "novc6"]),
     ("IceStorm/federation2", ["service", "novc6"]),
-    ("IceStorm/stress", ["service", "stress", "novc6"]),
+    ("IceStorm/stress", ["service", "stress", "novc6", "noappverifier"]), # This test is very slow with appverifier.
     ("IceStorm/rep1", ["service", "novc6"]),
     ("IceStorm/repgrid", ["service", "novc6"]),
     ("IceStorm/repstress", ["service", "noipv6", "stress", "novc6"]),
     ("FreezeScript/dbmap", ["once", "novc6"]),
     ("FreezeScript/evictor", ["once", "novc6"]),
-    ("IceGrid/simple", ["service", "novc6"]),
+    ("IceGrid/simple", ["service"]),
     ("IceGrid/deployer", ["service", "nobcc", "novc6"]),
     ("IceGrid/session", ["service", "nobcc", "novc6"]),
     ("IceGrid/update", ["service", "nobcc", "novc6"]),
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index fbf2f56ffd7..0d9204e7fe7 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -30,6 +30,9 @@ TestUtil.cleanDbDir(dbdir)
 
 client = os.path.join(os.getcwd(), "client")
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([client])
+
 print "starting populate...",
 populateProc = TestUtil.startClient(client, " --dbdir %s populate" % os.getcwd(), startReader = False)
 print "ok"
@@ -42,3 +45,5 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([client])
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index 4ae3483a5b9..c1ae645641a 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -25,6 +25,11 @@ TestUtil.cleanDbDir(dbdir)
 
 client = os.path.join(os.getcwd(), "client")
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([client])
+
 clientProc = TestUtil.startClient(client, " --Freeze.Warn.Rollback=0 %s" % os.getcwd())
 clientProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([client])
diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py
index 1cbc620a9dc..305be843ca8 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/run.py
@@ -20,8 +20,12 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
+
 transformdb = os.path.join(TestUtil.getCppBinDir(), "transformdb")
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([transformdb])
+
 dbdir = os.path.join(os.getcwd(), "db")
 TestUtil.cleanDbDir(dbdir)
 
@@ -138,3 +142,5 @@ if os.system(command) != 0:
 
 print "ok"
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([transformdb])
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index 2c0d5d77d9f..a4fa6c49e2a 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/run.py
@@ -22,6 +22,9 @@ from scripts import *
 
 transformdb = os.path.join(TestUtil.getCppBinDir(), "transformdb")
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([transformdb])
+
 dbdir = os.path.join(os.getcwd(), "db")
 TestUtil.cleanDbDir(dbdir)
 
@@ -66,3 +69,5 @@ proc = TestUtil.spawn(command)
 proc.waitTestSuccess()
 print "ok"
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([transformdb])
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index 0f29d74b466..6a39c54ae3b 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -23,6 +23,9 @@ from scripts import *
 testdir = os.getcwd()
 router = TestUtil.getGlacier2Router()
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([router])
+
 args = ' --Glacier2.RoutingTable.MaxSize=10' + \
        ' --Glacier2.Client.Endpoints="default -p 12347"' + \
        ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
@@ -37,3 +40,5 @@ TestUtil.clientServerTest()
 
 starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([router])
diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py
index 9fd48964884..13fabef6559 100755
--- a/cpp/test/Glacier2/dynamicFiltering/run.py
+++ b/cpp/test/Glacier2/dynamicFiltering/run.py
@@ -21,13 +21,19 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 server = os.path.join(os.getcwd(), "server")
+client = os.path.join(os.getcwd(), "client")
+router = os.path.join(TestUtil.getGlacier2Router())
+
+targets = []
+if TestUtil.appverifier:
+    targets = [server, client, router]
+    TestUtil.setAppVerifierSettings(targets)
+
 
 print "starting server...",
 serverProc = TestUtil.startServer(server, count=3)
 print "ok"
 
-router = TestUtil.getGlacier2Router()
-
 args = r' --Glacier2.Client.Endpoints="default -p 12347"' + \
         r' --Ice.Admin.Endpoints="tcp -p 12348"' + \
         r' --Ice.Admin.InstanceName=Glacier2' + \
@@ -40,7 +46,7 @@ print "starting router...",
 starterProc = TestUtil.startServer(router, args, count=2) 
 print "ok"
 
-client = os.path.join(os.getcwd(), "client")
+
 
 print "starting client...",
 proc = TestUtil.startClient(client, startReader = False)
@@ -51,3 +57,5 @@ proc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets)
diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py
index 0a402d20def..ea8e7acfd9b 100755
--- a/cpp/test/Glacier2/router/run.py
+++ b/cpp/test/Glacier2/router/run.py
@@ -22,6 +22,9 @@ from scripts import *
 
 router = TestUtil.getGlacier2Router()
 
+if TestUtil.appverifier:
+    TestUtil.setAppVerifierSettings([router])
+
 def startRouter(buffered):
 
     args = ' --Ice.Warn.Dispatch=0' + \
@@ -71,3 +74,6 @@ TestUtil.clientServerTest(name, additionalClientOptions = " --shutdown")
 
 starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([router])
+
diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py
index 1acbd18ae7f..cfa62a17049 100755
--- a/cpp/test/Glacier2/sessionControl/run.py
+++ b/cpp/test/Glacier2/sessionControl/run.py
@@ -21,13 +21,18 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 server = os.path.join(os.getcwd(), "server")
+router = TestUtil.getGlacier2Router()
+client = os.path.join(os.getcwd(), "client")
+
+targets = []
+if TestUtil.appverifier:
+    targets = [server, client, router]
+    TestUtil.setAppVerifierSettings(targets)
 
 print "starting server...",
 serverProc = TestUtil.startServer(server)
 print "ok"
 
-router = TestUtil.getGlacier2Router()
-
 args =    ' --Glacier2.Client.Endpoints="default -p 12347"' + \
           ' --Ice.Admin.Endpoints="tcp -p 12348"' + \
           ' --Ice.Admin.InstanceName=Glacier2' + \
@@ -39,7 +44,7 @@ print "starting router...",
 starterProc = TestUtil.startServer(router, args, count = 2)
 print "ok"
 
-client = os.path.join(os.getcwd(), "client")
+
 
 #
 # The test may sporadically fail without this slight pause.
@@ -55,3 +60,6 @@ clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets)
+
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py
index 75ea6ded937..86bd2685ae0 100755
--- a/cpp/test/Glacier2/ssl/run.py
+++ b/cpp/test/Glacier2/ssl/run.py
@@ -21,13 +21,18 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 server = os.path.join(os.getcwd(), "server")
+client = os.path.join(os.getcwd(), "client")
+router = TestUtil.getGlacier2Router()
+
+targets = []
+if TestUtil.appverifier:
+    targets = [server, client, router]
+    TestUtil.setAppVerifierSettings(targets)
 
 print "starting server...",
 serverProc = TestUtil.startServer(server)
 print "ok"
 
-router = TestUtil.getGlacier2Router()
-
 args = ' --Ice.Warn.Dispatch=0' + \
        ' --Glacier2.AddSSLContext=1' + \
        ' --Glacier2.AddConnectionContext=1' + \
@@ -48,7 +53,7 @@ print "ok"
 
 clientCfg = TestUtil.DriverConfig("client")
 clientCfg.protocol = "ssl"
-client = os.path.join(os.getcwd(), "client")
+
 print "starting client...",
 clientProc = TestUtil.startClient(client, "", clientCfg, startReader = False)
 print "ok"
@@ -58,3 +63,5 @@ clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets)
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index 51be16b17e2..f1d7a6df140 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -25,6 +25,15 @@ fqdn = socket.getfqdn()
 
 limitedTests = False
 
+router = TestUtil.getGlacier2Router()
+clientCmd = os.path.join(os.getcwd(), 'client')
+serverCmd = os.path.join(os.getcwd(), 'server')
+
+targets = []
+if TestUtil.appverifier:
+    targets = [serverCmd, clientCmd, router]
+    TestUtil.setAppVerifierSettings(targets)
+
 # 
 # Try and figure out what tests are reasonable with this host's
 # configuration.
@@ -223,8 +232,6 @@ elif len(testcases) < 6:
     print "WARNING: The network configuration for this host does not permit all "
     print "         tests to run correctly, some tests have been disabled."
 
-router = TestUtil.getGlacier2Router()
-
 def pingProgress():
     sys.stdout.write('.')
     sys.stdout.flush()
@@ -327,7 +334,6 @@ for testcase in testcases:
     else:
         serverOptions = ""
 
-    serverCmd = os.path.join(os.getcwd(), 'server')
     serverDriver = TestUtil.DriverConfig("server")
     if serverDriver.host == "127.0.0.1":
         serverDriver.host = None
@@ -342,7 +348,6 @@ for testcase in testcases:
     # The client is responsible for reporting success or failure. A test
     # failure will result in an assertion and the test will abort.
     #
-    clientCmd = os.path.join(os.getcwd(), 'client')
     clientDriver = TestUtil.DriverConfig("client")
     if clientDriver.host == "127.0.0.1":
         clientDriver.host = None
@@ -353,3 +358,5 @@ for testcase in testcases:
     serverProc.waitTestSuccess()
     starterProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets)
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py
index da65b5f38b2..cd8d98039cc 100755
--- a/cpp/test/IceGrid/admin/run.py
+++ b/cpp/test/IceGrid/admin/run.py
@@ -20,13 +20,6 @@ if len(path) == 0:
 sys.path.append(path[0])
 from scripts import *
 
-
-def getIceGridAdmin():
-    if TestUtil.isBCC2010():
-        return os.path.join(TestUtil.getServiceDir(), "icegridadmin")
-    else:
-        return os.path.join(TestUtil.getCppBinDir(), "icegridadmin")
-
 if not TestUtil.isWin32() and os.getuid() == 0:
     print
     print "*** can't run test as root ***"
@@ -35,12 +28,18 @@ if not TestUtil.isWin32() and os.getuid() == 0:
 
 testdir = os.getcwd();
 
+router = TestUtil.getGlacier2Router()
+targets = []
+if TestUtil.appverifier:
+    targets = [ TestUtil.getIceGridNode(), TestUtil.getIceGridRegistry(), router]
+    TestUtil.setAppVerifierSettings(targets)
+
 registryProcs = IceGridAdmin.startIceGridRegistry(testdir)
 nodeProc = IceGridAdmin.startIceGridNode(testdir)
 
 print "starting glacier2...",
 sys.stdout.flush()
-router = TestUtil.getGlacier2Router()
+
 args = ' --Glacier2.SessionTimeout=5' + \
        ' --Glacier2.Client.Endpoints="default -p 12347"' + \
        ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
@@ -57,7 +56,7 @@ print "testing login with username/password...",
 sys.stdout.flush()
 
 # Direct registry connection with username/password
-icegridadmin = getIceGridAdmin()
+icegridadmin = TestUtil.getIceGridAdmin()
 args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010"' + \
        ' --IceGridAdmin.Username=demo' + \
        ' --IceGridAdmin.Password=dummy'
@@ -86,7 +85,7 @@ if TestUtil.protocol == "ssl":
     sys.stdout.flush()
 
     # Direct registry connection with SSL
-    icegridadmin = getIceGridAdmin()
+    icegridadmin = TestUil.getIceGridAdmin()
     args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010" --ssl'
     admin = TestUtil.startClient(icegridadmin, args, None, None, False)
     admin.expect('>>> ')
@@ -108,7 +107,7 @@ if TestUtil.protocol == "ssl":
 
 print "testing commands...",
 sys.stdout.flush()
-icegridadmin = getIceGridAdmin()
+icegridadmin = TestUtil.getIceGridAdmin()
 args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010"' + \
        ' --IceGridAdmin.Username=demo' + \
        ' --IceGridAdmin.Password=dummy'
@@ -254,3 +253,6 @@ IceGridAdmin.iceGridAdmin("node shutdown localnode")
 IceGridAdmin.shutdownIceGridRegistry(registryProcs)
 nodeProc.waitTestSuccess()
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets)
+
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index bfd0d7a83ea..0d203991b3d 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -21,10 +21,15 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
-def doTest(icestorm, batch):
+publisher = os.path.join(os.getcwd(), "publisher")
+subscriber = os.path.join(os.getcwd(), "subscriber")
+
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, TestUtil.getIceBoxAdmin(), TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
 
-    publisher = os.path.join(os.getcwd(), "publisher")
-    subscriber = os.path.join(os.getcwd(), "subscriber")
+def doTest(icestorm, batch):
 
     if batch:
         name = "batch subscriber"
@@ -86,3 +91,5 @@ runtest("transient")
 runtest("replicated", replicatedPublisher = False)
 runtest("replicated", replicatedPublisher = True)
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 8eb366eda62..fd4820ea83e 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -29,6 +29,11 @@ else:
 publisher = os.path.join(os.getcwd(), "publisher")
 subscriber = os.path.join(os.getcwd(), "subscriber")
 
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, TestUtil.getIceBoxAdmin(), TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 def admin(ref, command):
     proc = TestUtil.startClient(iceStormAdmin, ref + ' -e "%s"' % command, echo = False)
     proc.waitTestSuccess()
@@ -267,4 +272,7 @@ runtest("persistent")
 runtest("replicated", replicatedPublisher = False)
 runtest("replicated", replicatedPublisher = True)
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
+
 sys.exit(0)
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py
index 101b88d70df..8937054184e 100755
--- a/cpp/test/IceStorm/rep1/run.py
+++ b/cpp/test/IceStorm/rep1/run.py
@@ -24,6 +24,12 @@ publisher = os.path.join(os.getcwd(), "publisher")
 subscriber = os.path.join(os.getcwd(), "subscriber")
 subscriber2 = os.path.join(os.getcwd(), "sub")
 
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, subscriber2, TestUtil.getIceBoxAdmin(), \
+               TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 def runsub(opt, ref, arg = "", echo=False):
     qos = ""
     if opt == "twoway":
@@ -282,3 +288,5 @@ sys.stdout.flush()
 icestorm.stop()
 print "ok"
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
diff --git a/cpp/test/IceStorm/repgrid/run.py b/cpp/test/IceStorm/repgrid/run.py
index 516c42d48e2..77bce6d70f2 100755
--- a/cpp/test/IceStorm/repgrid/run.py
+++ b/cpp/test/IceStorm/repgrid/run.py
@@ -20,6 +20,11 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 #
 # Remove IceStorm databases possibly left from SQL run.
 #
@@ -38,3 +43,5 @@ else:
 #
 IceGridAdmin.iceGridTest("application.xml", "", variables)
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py
index 0248a86e982..e3a8ca2b746 100755
--- a/cpp/test/IceStorm/repstress/run.py
+++ b/cpp/test/IceStorm/repstress/run.py
@@ -24,6 +24,12 @@ publisher = os.path.join(os.getcwd(), "publisher")
 subscriber = os.path.join(os.getcwd(), "subscriber")
 control = os.path.join(os.getcwd(), "control")
 
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, control, TestUtil.getIceBoxAdmin(), \
+               TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 def runcontrol(proxy):
     proc = TestUtil.startClient(control, ' "%s"' % proxy)
     proc.waitTestSuccess()
@@ -115,3 +121,5 @@ print "ok"
 
 print "publisher published %s events, subscriber received %s events" % (publisherCount, subscriberCount)
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index c3bfc29607b..edede8cf3ae 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -21,6 +21,15 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
+publisher = os.path.join(os.getcwd(), "publisher")
+subscriber = os.path.join(os.getcwd(), "subscriber")
+
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, TestUtil.getIceBoxAdmin(), \
+               TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 def dotest(type):
     icestorm = IceStormUtil.init(TestUtil.toplevel, os.getcwd(), type)
 
@@ -31,9 +40,6 @@ def dotest(type):
     icestorm.admin("create single")
     print "ok"
 
-    publisher = os.path.join(os.getcwd(), "publisher")
-    subscriber = os.path.join(os.getcwd(), "subscriber")
-
     print "starting subscriber...",
     sys.stdout.flush()
     subscriberProc = TestUtil.startServer(subscriber, icestorm.reference(), count = 5)
@@ -69,4 +75,7 @@ dotest("persistent")
 dotest("transient")
 dotest("replicated")
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd([targets], cwd = os.getcwd())
+
 sys.exit(0)
diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py
index 74095b81acf..52b280ef023 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -26,9 +26,16 @@ if TestUtil.isBCC2010():
 else:
     iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin")
 
+publisher = os.path.join(os.getcwd(), "publisher")
+subscriber = os.path.join(os.getcwd(), "subscriber")
+
+targets = []
+if TestUtil.appverifier:
+    targets = [TestUtil.getIceBox(), publisher, subscriber, TestUtil.getIceBoxAdmin(), \
+               TestUtil.getIceStormAdmin()]
+    TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
+
 def doTest(server1, server2, subOpts, pubOpts):
-    publisher = os.path.join(os.getcwd(), "publisher")
-    subscriber = os.path.join(os.getcwd(), "subscriber")
 
     subscriberProcs = []
     if type(subOpts) != type([]):
@@ -174,3 +181,5 @@ def runtest(type):
 runtest("persistent")
 runtest("replicated")
 
+if TestUtil.appverifier:
+    TestUtil.appVerifierAfterTestEnd(targets, cwd = os.getcwd())
diff --git a/cpp/test/IceUtil/condvar/run.py b/cpp/test/IceUtil/condvar/run.py
index 64348483c65..b8a4a33f857 100755
--- a/cpp/test/IceUtil/condvar/run.py
+++ b/cpp/test/IceUtil/condvar/run.py
@@ -28,5 +28,6 @@ match = os.path.join(os.getcwd(), "match")
 
 TestUtil.simpleTest(match)
 
-TestUtil.simpleTest(match + " -b")
-
+# Don't use simpleTest(match + " -b") this will confuse
+# appverifier about the name of target exe
+TestUtil.simpleTest(match, " -b")