summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 21:56:31 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 21:56:31 +0000
commit00bf636545e88e8fb0eaf92d7db81f3a2abd6512 (patch)
treece5ea535775868ab5c228d692f2b1c6f9666ede7 /testing
parent886536d9dd160f1bced2cf19c73d4b1b321dbc5e (diff)
downloadchromium_src-00bf636545e88e8fb0eaf92d7db81f3a2abd6512.zip
chromium_src-00bf636545e88e8fb0eaf92d7db81f3a2abd6512.tar.gz
chromium_src-00bf636545e88e8fb0eaf92d7db81f3a2abd6512.tar.bz2
Fix icevm commands from replacing test commands.
NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/10880011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/xvfb.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/xvfb.py b/testing/xvfb.py
index 7a42d47..e8feaac 100755
--- a/testing/xvfb.py
+++ b/testing/xvfb.py
@@ -109,9 +109,9 @@ def run_executable(cmd, build_dir, env):
# Some ChromeOS tests need a window manager. Technically, it could be
# another script but that would be overkill.
try:
- cmd = ['icewm']
+ ice_cmd = ['icewm']
subprocess.Popen(
- cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
+ ice_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
except OSError:
print >> sys.stderr, 'Failed to run %s' % ' '.join(cmd)
return 1