Change from absolute paths to relative paths to allow tests,etc. to be located...

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

o3d/tests/lab/run_lab_test.py

@@ -62,22 +62,21 @@ SCREEN_BPP = 32
 join = os.path.join
 
 if util.IsWindows():
-  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files', 
+  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
                          'bin', 'win', 'perceptualdiff.exe')
 elif util.IsMac():
-  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
+  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
                          'bin', 'mac', 'perceptualdiff')
 else:
-  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
+  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
                          'bin', 'linux', 'perceptualdiff')
 
-SELENIUM_TEST_RUNNER_PATH = join(const.O3D_PATH, 'o3d', 'tests', 'selenium',
-                                 'main.py')
+SELENIUM_TEST_RUNNER_PATH = join(const.TEST_PATH, 'selenium', 'main.py')
 
-SELENIUM_JAR_PATH = join(const.O3D_PATH, 'third_party', 'selenium_rc', 'files',
+SELENIUM_JAR_PATH = join(const.BASE_PATH, 'third_party', 'selenium_rc', 'files',
                          'selenium-server', 'selenium-server.jar')
 
-O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d', 'o3d_assets', 'tests',
+O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d_assets', 'tests',
                                  'screenshots')
 
 SCREENSHOTS_PATH = join(const.RESULTS_PATH,'screenshots')
@@ -193,16 +192,11 @@ def RunTest(browser):
   Returns:
     True on success.
   """
-  # Run selenium test.
-  os.chdir(const.AUTO_PATH)
   
   if util.IsWindows(): 
     if not run_util.EnsureWindowsScreenResolution(SCREEN_WIDTH, SCREEN_HEIGHT, 
                                                   SCREEN_BPP):
-      logging.error('Failed to configure screen resolution.')
-      return 1
-
-  
+      logging.warn('Could not detect/change screen resolution.')
 
   # Clear all screenshots.
   logging.info('** Deleting previous screenshots.')
@@ -263,7 +257,7 @@ def main(argv):
     config_path = argv[1]
   else:
     # Use default config file.
-    config_path = os.path.join(const.HOME_PATH, 'test_config.txt')
+    config_path = os.path.join(const.HOME, 'test_config.txt')
 
   # Uninstall/Install plugin.
   if not run_util.UninstallO3DPlugin():

o3d/tests/lab/runner_constants.py

@@ -29,7 +29,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-"""Defines common O3D test runner constants.
+"""Defines common O3D test runner constants. This file determines paths to
+other O3D components relatively, so it must be placed in the right location.
 
 """
 
@@ -40,55 +41,58 @@ import util
 
 join = os.path.join
 
-if util.IsWindows():
-  AUTO_PATH = r'C:\auto'
-  PYTHON = r'C:\Python24\python.exe'
-  if util.IsXP():
-    HOME_PATH = r'C:\Documents and Settings\testing'
-  else:
-    HOME_PATH = r'C:\Users\testing'
+# Make sure OS is supported.
+if not util.IsWindows() and not util.IsMac() and not util.IsLinux():
+  print 'Only Windows, Mac, and Linux are supported.'
+  sys.exit(1)
 
-elif util.IsMac():
-  AUTO_PATH = '/Users/testing/auto'
-  PYTHON = 'python'
-  HOME_PATH = '/Users/testing'
+# This path should be root/o3d/tests.
+TEST_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# This path should be root/o3d.
+O3D_PATH = os.path.dirname(TEST_PATH)
+# This path should be root, i.e., the checkout location.
+BASE_PATH = os.path.dirname(O3D_PATH)
 
-elif util.IsLinux():
-  AUTO_PATH = '/home/testing/auto'
-  PYTHON = 'python'
-  HOME_PATH = '/home/testing'
 
-else:
-  print 'Only Windows, Mac, and Linux are supported.'
+HOME = os.path.expanduser('~')
+if HOME == '~':
+  print 'Cannot find user home directory.'
   sys.exit(1)
 
-O3D_PATH = join(AUTO_PATH, 'o3d')
-SCRIPTS_PATH = join(AUTO_PATH, 'scripts')
-RESULTS_PATH = join(AUTO_PATH, 'results')
-SOFTWARE_PATH = join(AUTO_PATH, 'software')
+if util.IsWindows():
+  PYTHON = r'C:\Python24\python.exe'
+else:
+  PYTHON = 'python'
+
+# Note: this path may or may not exist.
+RESULTS_PATH = join(TEST_PATH, 'results')
 
 # Build directories.
 if util.IsWindows():
-  BUILD_PATH = join(O3D_PATH, 'o3d', 'build')
+  BUILD_PATH = join(O3D_PATH, 'build')
 elif util.IsMac():
-  BUILD_PATH = join(O3D_PATH, 'xcodebuild')
+  BUILD_PATH = join(BASE_PATH, 'xcodebuild')
 else:
-  BUILD_PATH = join(O3D_PATH, 'sconsbuild')
+  BUILD_PATH = join(BASE_PATH, 'sconsbuild')
   
+# Product directory.
 if os.path.exists(join(BUILD_PATH, 'Debug')):
   PRODUCT_DIR_PATH = join(BUILD_PATH, 'Debug')
-else:
+elif os.path.exists(join(BUILD_PATH, 'Release')):
   PRODUCT_DIR_PATH = join(BUILD_PATH, 'Release')
+else:
+  print 'Cannot find Debug or Release folder in ' + BUILD_PATH
+  sys.exit(1)
   
 # Plugin locations.
 INSTALL_PATHS = []
 if util.IsWindows():
-  INSTALL_PATHS += [join(HOME_PATH, 'Application Data', 'Mozilla',
+  INSTALL_PATHS += [join(HOME, 'Application Data', 'Mozilla',
                          'plugins', 'npo3dautoplugin.dll')]
-  INSTALL_PATHS += [join(HOME_PATH, 'Application Data', 'Google', 'O3D',
+  INSTALL_PATHS += [join(HOME, 'Application Data', 'Google', 'O3D',
                          'o3d_host.dll')]
 elif util.IsMac():
   INSTALL_PATHS += ['/Library/Internet Plug-Ins/O3D.plugin']
 else:
-  INSTALL_PATHS += [join(HOME_PATH, '.mozilla', 'plugins',
+  INSTALL_PATHS += [join(HOME, '.mozilla', 'plugins',
                          'libnpo3dautoplugin.so')]

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,