From 2beb48148fcbe01ea4d0ec2f2cf8f63557a2f433 Mon Sep 17 00:00:00 2001 From: "rcampbell%mozilla.com" Date: Mon, 28 Apr 2008 23:46:38 +0000 Subject: [PATCH] bug 417332 - moz2 unittest final patch git-svn-id: svn://10.0.0.236/trunk@250898 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/moz2unit/master.cfg | 39 +++++++++++++------ .../testing/moz2unit/mozconfig-firefox-win2k3 | 10 +---- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/mozilla/tools/buildbot-configs/testing/moz2unit/master.cfg b/mozilla/tools/buildbot-configs/testing/moz2unit/master.cfg index 32f01375693..ac1bb1a9436 100644 --- a/mozilla/tools/buildbot-configs/testing/moz2unit/master.cfg +++ b/mozilla/tools/buildbot-configs/testing/moz2unit/master.cfg @@ -144,11 +144,19 @@ moz2_linux_unittest_factory.addStep(ShellCommand, name="copy mozconfig", workdir='.') moz2_linux_unittest_factory.addStep(ShellCommand, name='mozconfig contents', command=['cat', '.mozconfig']) -moz2_linux_unittest_factory.addStep(Compile, command=['make', '-f', 'client.mk', 'build']) +moz2_linux_unittest_factory.addStep(Compile, + warnOnWarnings=False, + command=['make', '-f', 'client.mk', 'build']) moz2_linux_unittest_factory.addStep(MozillaCheck, warnOnWarnings=True, timeout=60*40, workdir="build/objdir") +moz2_linux_unittest_factory.addStep(CreateProfile, + warnOnWarnings=True, + workdir="build", + command = r'python testing/tools/profiles/createTestingProfile.py --binary objdir/dist/bin/firefox', + env=MozillaEnvironments['linux-centos-unittest'], + clobber=True) moz2_linux_unittest_factory.addStep(MozillaUnixReftest, warnOnWarnings=True, workdir="build/layout/reftests", env=MozillaEnvironments['linux-centos-unittest']) @@ -195,24 +203,31 @@ moz2_darwin_unittest_factory.addStep(ShellCommand, name="copy mozconfig", moz2_darwin_unittest_factory.addStep(ShellCommand, name='mozconfig contents', command=['cat', '.mozconfig']) moz2_darwin_unittest_factory.addStep(Compile, + warnOnWarnings=False, command=['make', '-f', 'client.mk', 'build']) moz2_darwin_unittest_factory.addStep(MozillaCheck, warnOnWarnings=True, timeout=60*40, workdir="build/objdir") -moz2_darwin_unittest_factory.addStep(MozillaUnixReftest, warnOnWarnings=True, +moz2_darwin_unittest_factory.addStep(CreateProfile, + warnOnWarnings=True, + workdir="build", + command = r'python testing/tools/profiles/createTestingProfile.py --binary objdir/dist/bin/firefox', + env=MozillaEnvironments['mac-osx-unittest'], + clobber=True) +moz2_darwin_unittest_factory.addStep(MozillaOSXReftest, warnOnWarnings=True, workdir="build/layout/reftests", env=MozillaEnvironments['mac-osx-unittest']) -moz2_darwin_unittest_factory.addStep(MozillaUnixCrashtest, warnOnWarnings=True, +moz2_darwin_unittest_factory.addStep(MozillaOSXCrashtest, warnOnWarnings=True, workdir="build/testing/crashtest", env=MozillaEnvironments['mac-osx-unittest']) -moz2_darwin_unittest_factory.addStep(MozillaMochitest, warnOnWarnings=True, +moz2_darwin_unittest_factory.addStep(MozillaOSXMochitest, warnOnWarnings=True, workdir="build/objdir/_tests/testing/mochitest", env=MozillaEnvironments['mac-osx-unittest']) -moz2_darwin_unittest_factory.addStep(MozillaMochichrome, warnOnWarnings=True, +moz2_darwin_unittest_factory.addStep(MozillaOSXMochichrome, warnOnWarnings=True, workdir="build/objdir/_tests/testing/mochitest", env=MozillaEnvironments['mac-osx-unittest']) -moz2_darwin_unittest_factory.addStep(MozillaBrowserChromeTest, warnOnWarnings=True, +moz2_darwin_unittest_factory.addStep(MozillaOSXBrowserChromeTest, warnOnWarnings=True, workdir="build/objdir/_tests/testing/mochitest", env=MozillaEnvironments['mac-osx-unittest']) @@ -280,11 +295,10 @@ moz2_win32_unittest_factory.addStep(ShellCommand, description='running client.py checkout', descriptionDone='client.py checkout', env=MozillaEnvironments['win32-vc8-mozbuild-unittest']) -#moz2_win32_unittest_factory.addStep(ShellCommand, name="download mozconfig", -# command=['cvs', '-d', CVSROOT, 'co', '-d', 'mozconfigs', -# 'mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3']) -moz2_win32_unittest_factory.addStep(FileDownload, mastersrc="mozconfig-firefox-win2k3", - slavedest="mozconfigs\\mozconfig-firefox-win2k3") +moz2_win32_unittest_factory.addStep(ShellCommand, name="download mozconfig", + command=['cvs', '-d', CVSROOT, 'co', '-d', 'mozconfigs', + 'mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3'], + env=MozillaEnvironments['win32-vc8-mozbuild-unittest']) moz2_win32_unittest_factory.addStep(ShellCommand, name="copy mozconfig", command=['copy', 'build\\mozconfigs\\mozconfig-firefox-win2k3', 'build\\.mozconfig'], workdir='.') @@ -292,7 +306,8 @@ moz2_win32_unittest_factory.addStep(ShellCommand, name="mozconfig contents", command=["type", ".mozconfig"], env=MozillaEnvironments['win32-vc8-mozbuild-unittest']) moz2_win32_unittest_factory.addStep(Compile, - command=["make", "-f", "client.mk", "build"], + command=["make", "-f", "client.mk", "build"], + warnOnWarnings=False, env=MozillaEnvironments['win32-vc8-mozbuild-unittest']) moz2_win32_unittest_factory.addStep(MozillaCheck, warnOnWarnings=True, workdir="build\\objdir", diff --git a/mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3 b/mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3 index ac4d29722c1..fba48530de7 100644 --- a/mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3 +++ b/mozilla/tools/buildbot-configs/testing/moz2unit/mozconfig-firefox-win2k3 @@ -6,15 +6,9 @@ # . $topsrcdir/browser/config/mozconfig mk_add_options MOZ_CO_PROJECT=browser -mk_add_options MOZ_MAKE_FLAGS="-j5" -mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging" -mk_add_options MOZ_PACKAGE_NSIS=1 +mk_add_options MOZ_MAKE_FLAGS="-j2" ac_add_options --enable-application=browser -ac_add_options --enable-update-channel=nightly ac_add_options --enable-optimize ac_add_options --disable-debug -# ac_add_options --enable-codesighs -ac_add_options --disable-tests -# ac_add_options --enable-official-branding -ac_add_options --enable-update-packaging +ac_add_options --enable-tests