diff options
| author | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 19:49:02 +0000 |
|---|---|---|
| committer | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 19:49:02 +0000 |
| commit | 8b160034c47761a7cefd93019d0c45b9f7911be7 (patch) | |
| tree | b3bb62cd24e539fdfa53391124d6f8adbcee7f91 /o3d/tests/lab/runner_util.py | |
| parent | e48aeb4867bfb18b50616a7b5be0df92460a7c10 (diff) | |
| download | chromium_src-8b160034c47761a7cefd93019d0c45b9f7911be7.zip chromium_src-8b160034c47761a7cefd93019d0c45b9f7911be7.tar.gz chromium_src-8b160034c47761a7cefd93019d0c45b9f7911be7.tar.bz2 | |
Change from absolute paths to relative paths to allow tests,etc. to be located in any directory, as long as the directory structure is correct.
Original review at: http://codereview.chromium.org/344013.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/lab/runner_util.py')
| -rw-r--r-- | o3d/tests/lab/runner_util.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/o3d/tests/lab/runner_util.py b/o3d/tests/lab/runner_util.py index 46bd32e..49ae569 100644 --- a/o3d/tests/lab/runner_util.py +++ b/o3d/tests/lab/runner_util.py @@ -42,8 +42,9 @@ import sys import runner_constants as const import util -CHANGE_RESOLUTION_PATH = (const.O3D_PATH + '/o3d/tests/lab' - '/ChangeResolution/Debug/changeresolution.exe') +CHANGE_RESOLUTION_PATH = os.path.join(const.TEST_PATH, 'lab', + 'ChangeResolution','Debug', + 'changeresolution.exe') def EnsureWindowsScreenResolution(width, height, bpp): """Performs all steps needed to configure system for testing on Windows. @@ -55,10 +56,10 @@ def EnsureWindowsScreenResolution(width, height, bpp): Returns: True on success. """ - + if not os.path.exists(CHANGE_RESOLUTION_PATH): + return False command = 'call "%s" %d %d %d' % (CHANGE_RESOLUTION_PATH, width, height, bpp) - our_process = subprocess.Popen(command, shell=True, stdout=None, |