From 960d8001f226e7f84ef47e3843f4add1d34d0be9 Mon Sep 17 00:00:00 2001 From: Joe George Date: Thu, 21 Jul 2016 12:06:42 -0400 Subject: ICE-7245 - Fix cross tests with C++ clients --- scripts/TestUtil.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'scripts/TestUtil.py') diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 033cf5c7860..10438fe42eb 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1277,11 +1277,11 @@ def getDefaultServerFile(baseDir = os.getcwd()): return pkg + "Server" raise RuntimeError("unknown language") -def getDefaultClientFile(lang = None): +def getDefaultClientFile(lang = None, baseDir = ""): if lang is None: lang = getDefaultMapping() if lang in ["cpp", "objective-c"]: - return getTestExecutable("client", "") + return getTestExecutable("client", baseDir) if lang == "ruby": return "Client.rb" if lang == "php": @@ -1540,14 +1540,15 @@ def clientServerTest(cfgName = None, additionalServerOptions = "", additionalCli print("** skipping cross test") return - clientCfg.lang = clientLang - client = getDefaultClientFile(clientLang) - clientDesc = os.path.basename(client) - if clientHome: clientdir = getMirrorDir(getClientCrossTestDir(testdir), clientLang) else: clientdir = getMirrorDir(testdir, clientLang) + + client = getDefaultClientFile(clientLang, clientdir) + clientDesc = os.path.basename(client) + clientCfg.lang = clientLang + if not os.path.exists(clientdir): print("** no matching test for %s" % clientLang) return -- cgit v1.2.3