From 579b60fede930f07e87111e9f89681c6ed092f0b Mon Sep 17 00:00:00 2001 From: "rcampbell%mozilla.com" Date: Thu, 24 Apr 2008 16:54:13 +0000 Subject: [PATCH] bug 417332 - moz2 unittest, buildbot custom changes, p=me, r=coop --- tools/buildbotcustom/env.py | 86 +++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/tools/buildbotcustom/env.py b/tools/buildbotcustom/env.py index b6bd5c80ab3..ce111b19959 100644 --- a/tools/buildbotcustom/env.py +++ b/tools/buildbotcustom/env.py @@ -78,7 +78,7 @@ MozillaEnvironments['linux-centos-unittest'] = { "CVS_RSH": 'ssh' } -MozillaEnvironments['mac-osx-tiger-unittest'] = { +MozillaEnvironments['mac-osx-unittest'] = { "MOZ_NO_REMOTE": '1', "NO_EM_RESTART": '1', "XPCOM_DEBUG_BREAK": 'warn', @@ -135,58 +135,60 @@ MozillaEnvironments['win32-vc8-mozbuild-unittest'] = { "MOZ_AIRBAG": '1', "MOZ_CRASHREPORTER_NO_REPORT": '1', "XPCOM_DEBUG_BREAK": 'warn', - "VCVARS": 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\bin\\vcvars32.bat', + "VCVARS": 'D:\\msvs8\\VC\\bin\\vcvars32.bat', "MOZ_MSVCVERSION": '8', - "MOZILLABUILD": 'C:\\mozilla-build', + "MOZILLABUILD": 'D:\\mozilla-build', "MOZILLABUILDDRIVE": 'C:', "MOZILLABUILDPATH": '\\mozilla-build\\', - "MOZ_TOOLS": 'C:\\mozilla-build\\moztools', + "MOZ_TOOLS": 'D:\\mozilla-build\\moztools', "CVS_RSH": 'ssh', - "VSINSTALLDIR": 'C:\\Program Files\\Microsoft Visual Studio 8', - "VCINSTALLDIR": 'C:\\Program Files\\Microsoft Visual Studio 8\\VC', + "VSINSTALLDIR": 'D:\\msvs8', + "VCINSTALLDIR": 'D:\\msvs8\\VC', "FrameworkDir": 'C:\\WINDOWS\\Microsoft.NET\\Framework', "FrameworkVersion": 'v2.0.50727', - "FrameworkSDKDir": 'C:\\Program Files\\Microsoft Visual Studio 8\\SDK\\v2.0', - "MSVCDir": 'C:\\Program Files\\Microsoft Visual Studio 8\\VC', - "DevEnvDir": "C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE", - "PATH": 'C:\\mozilla-build\\msys\\local\\bin;' + \ - 'C:\\mozilla-build\\wget;' + \ - 'C:\\mozilla-build\\7zip;' + \ - 'C:\\mozilla-build\\blat261\\full;' + \ - 'C:\\mozilla-build\\svn-win32-1.4.2\\bin;' + \ - 'C:\\mozilla-build\\upx203w;' + \ - 'C:\\mozilla-build\\xemacs\\XEmacs-21.4.19\\i586-pc-win32;' + \ - 'C:\\mozilla-build\\info-zip;' + \ - 'C:\\mozilla-build\\nsis-2.22;' + \ + "FrameworkSDKDir": 'D:\\msvs8\\SDK\\v2.0', + "MSVCDir": 'D:\\msvs8\\VC', + "DevEnvDir": "D:\\msvs8\\Common7\\IDE", + "PATH": 'D:\\mozilla-build\\msys\\local\\bin;' + \ + 'D:\\mozilla-build\\wget;' + \ + 'D:\\mozilla-build\\7zip;' + \ + 'D:\\mozilla-build\\blat261\\full;' + \ + 'D:\\mozilla-build\\svn-win32-1.4.2\\bin;' + \ + 'D:\\mozilla-build\\upx203w;' + \ + 'D:\\mozilla-build\\xemacs\\XEmacs-21.4.19\\i586-pc-win32;' + \ + 'D:\\mozilla-build\\info-zip;' + \ + 'D:\\mozilla-build\\nsis-2.22;' + \ '.;' + \ - 'C:\\mozilla-build\\msys\\bin;' + \ - 'C:\\Python24;' + \ - 'C:\\Python24\\Scripts;' + \ - 'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\bin;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools\\bin;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\PlatformSDK\\bin;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\SDK\\v2.0\\bin;' + \ + 'D:\\mozilla-build\\msys\\bin;' + \ + 'D:\\mozilla-build\\python25;' + \ + 'D:\\mozilla-build\\python25\\Scripts;' + \ + 'D:\\Mercurial;' + \ + 'D:\\SDKs\\v6.0\\bin;' + \ + 'D:\\msvs8\\Common7\\IDE;' + \ + 'D:\\msvs8\\VC\\BIN;' + \ + 'D:\\msvs8\\Common7\\Tools;' + \ + 'D:\\msvs8\\Common7\\Tools\\bin;' + \ + 'D:\\msvs8\\VC\\PlatformSDK\\bin;' + \ + 'D:\\msvs8\\SDK\\v2.0\\bin;' + \ 'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\VCPackages;' + \ + 'D:\\msvs8\\VC\\VCPackages;' + \ 'C:\\WINDOWS\\System32;' + \ 'C:\\WINDOWS;' + \ 'C:\\WINDOWS\\System32\\Wbem;' + \ - 'C:\\mozilla-build\\moztools\\bin;', - "INCLUDE": 'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\include;' + \ - 'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\include\\atl;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\ATLMFC\\INCLUDE;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\INCLUDE;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\PlatformSDK\\include;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\SDK\\v2.0\\include;' + \ + 'D:\\mozilla-build\\moztools\\bin;' + \ + 'D:\\Utilities;', + "INCLUDE": 'C:\\Program Files\\Microsoft SDKsD:\\SDKs\\v6.0\\include;' + \ + 'D:\\SDKs\\v6.0\\include\\atl;' + \ + 'D:\\msvs8\\VC\\ATLMFC\\INCLUDE;' + \ + 'D:\\msvs8\\VC\\INCLUDE;' + \ + 'D:\\msvs8\\VC\\PlatformSDK\\include;' + \ + 'D:\\msvs8\\SDK\\v2.0\\include;' + \ '%INCLUDE%', - "LIB": 'C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\lib;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\ATLMFC\\LIB;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\LIB;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\PlatformSDK\\lib;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\SDK\\v2.0\\lib;', + "LIB": 'D:\\SDKs\\v6.0\\lib;' + \ + 'D:\\msvs8\\VC\\ATLMFC\\LIB;' + \ + 'D:\\msvs8\\VC\\LIB;' + \ + 'D:\\msvs8\\VC\\PlatformSDK\\lib;' + \ + 'D:\\msvs8\\SDK\\v2.0\\lib;', "LIBPATH": 'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \ - 'C:\\Program Files\\Microsoft Visual Studio 8\\VC\\ATLMFC\\LIB' + 'D:\\msvs8\\VC\\ATLMFC\\LIB' }