~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/build/rules.mk

  • Committer: Chris Coulson
  • Date: 2013-09-17 11:05:10 UTC
  • mto: This revision was merged to the branch mainline in revision 1023.
  • Revision ID: chris.coulson@canonical.com-20130917110510-chob2tiw2glco8b9
* New upstream release from the beta channel (FIREFOX_25_0b1_BUILD1)
* Refresh patches
  - update d/p/test-fixes/xpcshell-docshell-no-writes-to-appdir.patch
  - update d/p/test-integration/xpcshell-write-time-for-failed-test.patch
  - update debian/patches/ubuntu-ua-string-changes.patch
  - update d/p/test-fixes/xpcshell-exthandler-no-writes-to-appdir.patch
  - update d/p/test-integration/automation-output-junit-xml.patch
  - update d/p/test-integration/mochitest-allow-test-manifest-for-browser-chrome.patch
  - update d/p/test-integration/xpcshell-disable-tests-which-need-appdir-write-access.patch
  - update debian/patches/unity-menubar.patch
* Drop patches
  - remove d/p/test-fixes/xpcshell-docshell-no-writes-to-appdir.patch
  - remove d/p/test-fixes/xpcshell-contentprefs-no-writes-to-appdir.patch
  - remove d/p/test-fixes/mochitest-browser-plugincrash-with-no-crashreporter.patch
  - update debian/patches/series
* Refactor the test results post-process script a bit so that it can use
  regular expressions in the configuration
  - update debian/testing/filter_results
  - update debian/testing/results-filter-manifest.json
  - update debian/tests/post-process
* Run mochitest-plain in 5 chunks, similar to upstream. This should fix
  some test failures we see that seem to be caused by some tests not
  cleaning up properly (seems to fix LP: #1158781 and LP: #1194448)
  - update debian/testing/run_mochitest.in
  - update debian/tests/control
  - move debian/tests/mochitest => debian/tests/mochitest-1
  - add debian/tests/mochitest-2
  - add debian/tests/mochitest-3
  - add debian/tests/mochitest-4
  - add debian/tests/mochitest-5
* Drop d/p/test-integration/test-sameoriginpolicy-debug.patch now that
  we run mochitest-plain in chunks
* Add OCSPStaplingServer binary to testsuite
  - update debian/firefox-testsuite.install.in
  - update debian/build/rules.mk
* Don't let make check failures fail the build for now, as there are some
  jit test failures
  - update debian/build/testsuite.mk
* Try to stop the buildd's from terminating the build during long links
  (use a hack based on the one for the Chromium package)
  - add debian/build/keepalive-wrapper.py
  - update debian/build/rules.mk
* Disable no_neon_on_arm.patch for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
DEB_INSTALL_DOCS_ALL    := $(NULL)
52
52
# scour breaks the testsuite
53
53
DEB_DH_SCOUR_ARGS               := -N$(MOZ_PKG_NAME)-testsuite
 
54
# Stop the buildd from timing out during long links
 
55
MAKE                                    := python $(CURDIR)/debian/build/keepalive-wrapper.py 1440 $(MAKE)
54
56
 
55
57
MOZ_VERSION             := $(shell cat $(DEB_SRCDIR)/$(MOZ_APP)/config/version.txt)
56
58
MOZ_LIBDIR              := usr/lib/$(MOZ_APP_NAME)
246
248
 
247
249
install-testsuite: debian/stamp-installtestsuite
248
250
debian/stamp-installtestsuite: debian/stamp-maketestsuite debian/stamp-makefile-install
 
251
        install $(MOZ_DISTDIR)/bin/OCSPStaplingServer debian/tmp/$(MOZ_LIBDIR)
249
252
        install $(MOZ_DISTDIR)/bin/xpcshell debian/tmp/$(MOZ_LIBDIR)
250
253
        install $(MOZ_DISTDIR)/bin/components/httpd.js debian/tmp/$(MOZ_LIBDIR)/components
251
254
        install $(MOZ_DISTDIR)/bin/components/httpd.manifest debian/tmp/$(MOZ_LIBDIR)/components