summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-11-23 23:45:59 +0100
committerJose <jose@zeroc.com>2012-11-23 23:45:59 +0100
commite3b8facb832ee9aa16b4d23553b9afc93e47302c (patch)
tree2a6cf4330e450a9f387039c676f334727c029857 /scripts/TestUtil.py
parentFixed (ICE-4992) cs\test\Ice\timeout failures Windows 7 VS 2010 (diff)
downloadice-e3b8facb832ee9aa16b4d23553b9afc93e47302c.tar.bz2
ice-e3b8facb832ee9aa16b4d23553b9afc93e47302c.tar.xz
ice-e3b8facb832ee9aa16b4d23553b9afc93e47302c.zip
Silverlight test suite fixes
* Use a separate output directories for Silverlight test suite, so we can build the .NET servers at the same time.
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 0929e570c09..d3a1039c58e 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -895,7 +895,7 @@ def getCommandLine(exe, config, options = ""):
elif config.lang == "rb" and config.type == "client":
output.write("ruby '" + exe + "' ")
elif config.silverlight and config.lang == "cs" and config.type == "client":
- xap = "%s.xap" % os.path.basename(os.getcwd())
+ xap = "obj/sl/%s.xap" % os.path.basename(os.getcwd())
if os.environ.get("PROCESSOR_ARCHITECTURE") == "AMD64" or os.environ.get("PROCESSOR_ARCHITEW6432") == "":
output.write('"%s (x86)\Microsoft Silverlight\sllauncher.exe" /emulate:%s ' % ( os.environ["PROGRAMFILES"], xap))
else: