Bug 516984 Allow mozmill unit test to work on windows a=NPOTB r=ctalbert
authorJeff Hammel <jhammel@mozilla.com>
Tue, 21 Sep 2010 15:29:59 -0700
changeset 54489 0e978c0a2b327a6facfc491ec50ddec3cfae8638
parent 54488 9f775e8f5852ab3c38f8ae9995d724980d059c07
child 54490 2709f62a9d9a1b46c269c364dc698b66da33fe16
push id15906
push userctalbert@mozilla.com
push dateTue, 21 Sep 2010 22:31:01 +0000
treeherdermozilla-central@0e978c0a2b32 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNPOTB, ctalbert
bugs516984
milestone2.0b7pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 516984 Allow mozmill unit test to work on windows a=NPOTB r=ctalbert
testing/mozmill/installmozmill.py
--- a/testing/mozmill/installmozmill.py
+++ b/testing/mozmill/installmozmill.py
@@ -74,13 +74,16 @@ def main(args=None):
   # packages to install in dependency order
   PACKAGES=file('PACKAGES').read().split()
   assert PACKAGES
   
   # create the virtualenv and install packages
   env = os.environ.copy()
   env.pop('PYTHONHOME', None)
   call([sys.executable, 'virtualenv/virtualenv.py', destination], env=env)
-  pip = os.path.join(destination, 'bin', 'pip')
+  if sys.platform.startswith('win'):
+    pip = os.path.join(destination, 'Scripts', 'pip.exe')
+  else:
+    pip = os.path.join(destination, 'bin', 'pip')
   call([pip, 'install'] + PACKAGES, env=env)
 
 if __name__ == '__main__':
   main()