Backed out changeset 0e628eff02f5 (bug 1069556) for multiple test failures after landing on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 26 Jan 2016 14:53:45 +0100
changeset 281749 3cd0368b06eda7647fab1805854f98c78fcec0c1
parent 281748 6cb7a7b8f87d7b0da98093607cb107417eabcfc3
child 281750 c7b86ad8cd86fe6a4613afec5ecf362006a1fdda
push id17256
push usercbook@mozilla.com
push dateWed, 27 Jan 2016 11:12:57 +0000
treeherderfx-team@60c5168a485c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1069556
milestone47.0a1
backs out0e628eff02f5cf6fdc118ef0e61f3e17f627e7d2
Backed out changeset 0e628eff02f5 (bug 1069556) for multiple test failures after landing on a CLOSED TREE
toolkit/crashreporter/update-breakpad.sh
--- a/toolkit/crashreporter/update-breakpad.sh
+++ b/toolkit/crashreporter/update-breakpad.sh
@@ -1,51 +1,36 @@
 #!/bin/bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-set -v -e -x
-
-# Usage: update-breakpad.sh <path to breakpad git clone> [rev, defaults to HEAD]
+# Usage: update-breakpad.sh <path to breakpad SVN>
 
 if [ $# -lt 1 ]; then
-  echo "Usage: update-breakpad.sh /path/to/breakpad/src [rev]"
+  echo "Usage: update-breakpad.sh /path/to/google-breakpad/"
   exit 1
 fi
 
-crashreporter_dir=`realpath $(dirname $0)`
+crashreporter_dir=`dirname $0`
 repo=${crashreporter_dir}/../..
 rm -rf ${crashreporter_dir}/google-breakpad
-
-breakpad_repo=$1
-rev=${2-HEAD}
-(cd $breakpad_repo; git archive --prefix=toolkit/crashreporter/google-breakpad/ $rev) | (cd $repo; tar xf -)
-# Breakpad uses gclient for externals, so manually export what we need.
-lss_rev=`python -c "import sys; execfile(sys.argv[1]); print deps['src/src/third_party/lss'].split('@')[1]" ${crashreporter_dir}/google-breakpad/DEPS`
-(cd $breakpad_repo/src/third_party/lss; git archive --prefix=toolkit/crashreporter/google-breakpad/src/third_party/lss/ $lss_rev) | (cd $repo; tar xf -)
+svn export $1 ${crashreporter_dir}/google-breakpad
 
 # remove some extraneous bits
-rm -rf \
-  ${crashreporter_dir}/google-breakpad/docs/ \
-  ${crashreporter_dir}/google-breakpad/src/third_party/protobuf \
-  ${crashreporter_dir}/google-breakpad/src/testing/ \
-  ${crashreporter_dir}/google-breakpad/src/tools/gyp/ \
-  ${crashreporter_dir}/google-breakpad/src/processor/testdata/ \
-  ${crashreporter_dir}/google-breakpad/src/tools/windows/dump_syms/testdata/
-
+rm -rf ${crashreporter_dir}/google-breakpad/src/third_party/protobuf ${crashreporter_dir}/google-breakpad/src/testing/ ${crashreporter_dir}/google-breakpad/src/tools/gyp/
 # restore our Makefile.ins
 hg -R ${repo} st -n | grep "Makefile\.in$" | xargs hg revert --no-backup
 # and moz.build files
 hg -R ${repo} st -n | grep "moz\.build$" | xargs hg revert --no-backup
 # and some other makefiles
-hg -R ${repo} st -n | grep "objs\.mozbuild$" | xargs hg revert --no-backup
+hg -R ${repo} st -n | grep "objs\.mk$" | xargs hg revert --no-backup
 
-# Record git rev
-(cd $breakpad_repo; git rev-parse $rev) > ${crashreporter_dir}/google-breakpad/GIT-INFO
+# Record `svn info`
+svn info $1 > ${crashreporter_dir}/google-breakpad/SVN-INFO
 
 # Apply any local patches
 shopt -s nullglob
 for p in ${crashreporter_dir}/breakpad-patches/*.patch; do
     if grep -q -e "--git" $p; then
         patch_opts="-p1"
     else
         patch_opts="-p0"
@@ -53,11 +38,11 @@ for p in ${crashreporter_dir}/breakpad-p
     echo "Applying $p"
     if ! filterdiff -x '*/Makefile*' $p | \
         patch -d ${crashreporter_dir}/google-breakpad ${patch_opts}; then
       echo "Failed to apply $p"
       exit 1
     fi
 done
 # remove any .orig files that snuck in
-find ${crashreporter_dir}/google-breakpad -name "*.orig" -exec rm '{}' \;
+find ${crashreporter_dir}/google-breakpad -name "*.orig" -print0 | xargs -0 rm
 
 hg addremove ${crashreporter_dir}/google-breakpad/