Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1464501) for build bustages. CLOSED TREE

Browse Source 
Backed out changeset 132442e73569 (bug 1464501)
Backed out changeset 7e85e1b2f6fa (bug 1464501)
Backed out changeset e891ab259427 (bug 1464501)
This commit is contained in:
Brindusan Cristian 2018-06-14 04:16:31 +03:00
parent df09db05b8
commit abab6bc7a4
8 changed files with 23 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taskcluster/ci/build/android.yml
View File

@ -44,7 +44,6 @@ android-api-16/debug:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-x86/opt:
@ -98,7 +97,6 @@ android-x86/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-x86-nightly/opt:
@ -158,7 +156,6 @@ android-x86-nightly/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-api-16/opt:
@ -207,7 +204,6 @@ android-api-16/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-api-16-without-google-play-services/opt:
@ -255,7 +251,6 @@ android-api-16-without-google-play-services/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-api-16-nightly/opt:
@ -310,7 +305,6 @@ android-api-16-nightly/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-aarch64/opt:
@ -359,7 +353,6 @@ android-aarch64/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache
android-aarch64-nightly/opt:
@ -414,5 +407,4 @@ android-aarch64-nightly/opt:
- android-sdk-linux
- linux64-clang
- linux64-rust-android
- linux64-rust-size
- linux64-sccache

20
taskcluster/ci/build/linux.yml
View File

@ -23,7 +23,6 @@ linux64/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-plain/opt:
@ -83,7 +82,6 @@ linux64-dmd/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64/pgo:
@ -112,7 +110,6 @@ linux64/pgo:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-fuzzing/debug:
@ -144,7 +141,6 @@ linux64-fuzzing/debug:
- linux64-gcc
- linux64-sccache
- linux64-rust
- linux64-rust-size
linux64/debug:
description: "Linux64 Debug"
@ -173,7 +169,6 @@ linux64/debug:
- linux64-gcc
- linux64-sccache
- linux64-rust
- linux64-rust-size
linux64-plain/debug:
description: "Linux64 Debug Plain"
@ -236,7 +231,6 @@ linux64-devedition-nightly/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-base-toolchains/opt:
@ -324,7 +318,6 @@ linux/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux/debug:
@ -354,7 +347,6 @@ linux/debug:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux/pgo:
@ -384,7 +376,6 @@ linux/pgo:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux-rusttests/opt:
@ -489,7 +480,6 @@ linux-devedition-nightly/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux-nightly/opt:
@ -524,7 +514,6 @@ linux-nightly/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
@ -556,7 +545,6 @@ linux64-asan/opt:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
@ -588,7 +576,6 @@ linux64-asan-fuzzing/opt:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-asan-reporter-nightly/opt:
@ -623,7 +610,6 @@ linux64-asan-reporter-nightly/opt:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-asan/debug:
@ -654,7 +640,6 @@ linux64-asan/debug:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-lto/opt:
@ -686,7 +671,6 @@ linux64-lto/opt:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-lto/debug:
@ -718,7 +702,6 @@ linux64-lto/debug:
- linux64-clang-6
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-nightly/opt:
@ -752,7 +735,6 @@ linux64-nightly/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-noopt/debug:
@ -784,7 +766,6 @@ linux64-noopt/debug:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache
linux64-rusttests/opt:
@ -1000,5 +981,4 @@ linux64-add-on-devel/opt:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-rust-size
- linux64-sccache

9
taskcluster/ci/build/macosx.yml
View File

@ -29,7 +29,6 @@ macosx64/debug:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64/opt:
@ -62,7 +61,6 @@ macosx64/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-asan-fuzzing/opt:
@ -96,7 +94,6 @@ macosx64-asan-fuzzing/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-dmd/opt:
@ -132,7 +129,6 @@ macosx64-dmd/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-devedition-nightly/opt:
@ -173,7 +169,6 @@ macosx64-devedition-nightly/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-noopt/debug:
@ -209,7 +204,6 @@ macosx64-noopt/debug:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-add-on-devel/opt:
@ -244,7 +238,6 @@ macosx64-add-on-devel/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-nightly/opt:
@ -283,7 +276,6 @@ macosx64-nightly/opt:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache
macosx64-ccov/debug:
@ -318,5 +310,4 @@ macosx64-ccov/debug:
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-rust-size
- linux64-sccache

19
taskcluster/ci/build/windows.yml
View File

@ -24,7 +24,6 @@ win32/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32/opt:
@ -53,7 +52,6 @@ win32/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-dmd/opt:
@ -85,7 +83,6 @@ win32-dmd/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32/pgo:
@ -114,7 +111,6 @@ win32/pgo:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64/debug:
@ -143,7 +139,6 @@ win64/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-plain/debug:
@ -201,7 +196,6 @@ win64/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-plain/opt:
@ -262,7 +256,6 @@ win64-dmd/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-nightly/opt:
@ -305,7 +298,6 @@ win32-nightly/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-nightly/opt:
@ -341,7 +333,6 @@ win64-nightly/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64/pgo:
@ -370,7 +361,6 @@ win64/pgo:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-add-on-devel/opt:
@ -400,7 +390,6 @@ win32-add-on-devel/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-add-on-devel/opt:
@ -430,7 +419,6 @@ win64-add-on-devel/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-noopt/debug:
@ -460,7 +448,6 @@ win64-noopt/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-noopt/debug:
@ -490,7 +477,6 @@ win32-noopt/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-rusttests/opt:
@ -580,7 +566,6 @@ win64-ccov/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-asan/debug:
@ -611,7 +596,6 @@ win64-asan/debug:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-asan/opt:
@ -642,7 +626,6 @@ win64-asan/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-devedition-nightly/opt:
@ -686,7 +669,6 @@ win32-devedition-nightly/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win64-devedition-nightly/opt:
@ -723,7 +705,6 @@ win64-devedition-nightly/opt:
toolchains:
- win64-clang-cl
- win64-rust
- win64-rust-size
- win64-sccache
win32-mingw32/opt:

19
taskcluster/ci/toolchain/linux.yml
View File

@ -504,25 +504,6 @@ linux64-sccache:
toolchains:
- linux64-rust-1.24
linux64-rust-size:
description: "rust-size toolchain build"
treeherder:
kind: build
platform: toolchains/opt
symbol: TL(rust-size)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 1800
run:
using: toolchain-script
script: build-rust-size.sh
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/rust-size.tar.xz
toolchains:
- linux64-rust-1.24
linux64-gn:
description: "gn toolchain build"
treeherder:

21
taskcluster/ci/toolchain/windows.yml
View File

@ -214,27 +214,6 @@ win64-sccache:
toolchains:
- win64-rust-1.24
win64-rust-size:
description: "rust-size toolchain build"
treeherder:
kind: build
platform: toolchains/opt
symbol: TW64(rust-size)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 1800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
run:
using: toolchain-script
script: build-rust-size.sh
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/rust-size.tar.bz2
toolchains:
- win64-rust-1.24
win32-gn:
description: "gn toolchain build"
treeherder:

57
taskcluster/scripts/misc/build-rust-size.sh
View File

@ -1,57 +0,0 @@
#!/bin/bash
set -x -e -v
OWNER=luser
PROJECT=rust-size
PROJECT_REVISION=4a5d9148f50dc037dc230f10b8fc4e5ca00016aa
# This script is for building rust-size
case "$(uname -s)" in
Linux)
WORKSPACE=$HOME/workspace
UPLOAD_DIR=$HOME/artifacts
COMPRESS_EXT=xz
;;
MINGW*)
WORKSPACE=$PWD
UPLOAD_DIR=$WORKSPACE/public/build
WIN_WORKSPACE="$(pwd -W)"
COMPRESS_EXT=bz2
export INCLUDE="$WIN_WORKSPACE/build/src/vs2017_15.4.2/VC/include;$WIN_WORKSPACE/build/src/vs2017_15.4.2/VC/atlmfc/include;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/Include/10.0.15063.0/ucrt;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/Include/10.0.15063.0/shared;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/Include/10.0.15063.0/um;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/Include/10.0.15063.0/winrt;$WIN_WORKSPACE/build/src/vs2017_15.4.2/DIA SDK/include"
export LIB="$WIN_WORKSPACE/build/src/vs2017_15.4.2/VC/lib/x64;$WIN_WORKSPACE/build/src/vs2017_15.4.2/VC/atlmfc/lib/x64;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/lib/10.0.15063.0/um/x64;$WIN_WORKSPACE/build/src/vs2017_15.4.2/SDK/lib/10.0.15063.0/ucrt/x64;$WIN_WORKSPACE/build/src/vs2017_15.4.2/DIA SDK/lib/amd64"
PATH="$WORKSPACE/build/src/vs2017_15.4.2/VC/bin/Hostx64/x64:$WORKSPACE/build/src/vs2017_15.4.2/VC/bin/Hostx86/x86:$WORKSPACE/build/src/vs2017_15.4.2/SDK/bin/10.0.15063.0/x64:$WORKSPACE/build/src/vs2017_15.4.2/redist/x64/Microsoft.VC141.CRT:$WORKSPACE/build/src/vs2017_15.4.2/SDK/Redist/ucrt/DLLs/x64:$WORKSPACE/build/src/vs2017_15.4.2/DIA SDK/bin/amd64:$WORKSPACE/build/src/mingw64/bin:$PATH"
;;
esac
cd $WORKSPACE/build/src
. taskcluster/scripts/misc/tooltool-download.sh
# cargo gets mad if the parent directory has a Cargo.toml file in it
if [ -e Cargo.toml ]; then
mv Cargo.toml Cargo.toml.back
fi
PATH="$PWD/rustc/bin:$PATH"
git clone -n https://github.com/${OWNER}/${PROJECT} ${PROJECT}
cd $PROJECT
git checkout $PROJECT_REVISION
cargo build --verbose --release
mkdir $PROJECT
cp target/release/${PROJECT}* ${PROJECT}/
tar -acf ${PROJECT}.tar.$COMPRESS_EXT $PROJECT
mkdir -p $UPLOAD_DIR
cp ${PROJECT}.tar.$COMPRESS_EXT $UPLOAD_DIR
cd ..
if [ -e Cargo.toml.back ]; then
mv Cargo.toml.back Cargo.toml
fi

57
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -1606,35 +1606,35 @@ or run without that action (ie: --no-{action})"
"""
from StringIO import StringIO
# Check for `rust_size`, our cross platform version of size. It should
# be installed by tooltool in $abs_src_dir/rust-size/rust-size
rust_size = os.path.join(self.query_abs_dirs()['abs_src_dir'],
'rust-size', 'rust-size')
size_prog = self.which(rust_size)
# Check for binutils' `size` program
size_names = ('size', 'gsize')
size_prog = None
for name in size_names:
size_prog = self.which(name)
if size_prog:
break
if not size_prog:
self.info("Couldn't find `rust-size` program")
self.info("Couldn't find `size` program")
return {}
self.info("Using %s" % size_prog)
cmd = [size_prog, file]
# Call `size` and output with SysV format in decimal radix
cmd = [size_prog, '-A', '-d', file]
output = self.get_output_from_command(cmd)
if not output:
self.info("`rust-size` failed")
return {}
# Format is JSON:
# {
# "section_type": {
# "section_name": size, ....
# },
# ...
# }
parsed = json.loads(output)
# Format is:
# <section-name> <size> <address>, ie:
# .data 302160 101053344
size_section_re = re.compile(r"([\w\.]+)\s+(\d+)\s+(\d+)")
sections = {}
for sec_type in parsed.itervalues():
for name, size in sec_type.iteritems():
for line in output.splitlines():
m = size_section_re.match(line)
if m:
name = m.group(1)
if not filter or name in filter:
sections[name] = size
sections[name] = int(m.group(2))
return sections
@ -1650,8 +1650,9 @@ or run without that action (ie: --no-{action})"
'avcodec': ('libmozavcodec.so', 'mozavcodec.dll', 'libmozavcodec.dylib'),
'avutil': ('libmozavutil.so', 'mozavutil.dll', 'libmozavutil.dylib')
}
section_interests = ('.text', '.data', '.rodata', '.rdata',
'.cstring', '.data.rel.ro', '.bss')
# TODO(erahm): update for windows and osx. As-is we only have support
# for `size` on debian which gives us linux and android.
section_interests = ('.text', '.data', '.rodata', '.data.rel.ro', '.bss')
lib_details = []
dirs = self.query_abs_dirs()
@ -1666,18 +1667,6 @@ or run without that action (ie: --no-{action})"
section_details = self._get_sections(lib, section_interests)
section_measurements = []
# Build up the subtests
# Lump rodata sections together
# - Mach-O separates out read-only string data as .cstring
# - PE really uses .rdata, but XUL at least has a .rodata as well
for ro_alias in ('.cstring', '.rdata'):
if ro_alias in section_details:
if '.rodata' in section_details:
section_details['.rodata'] += section_details[ro_alias]
else:
section_details['.rodata'] = section_details[ro_alias]
del section_details[ro_alias]
for k, v in section_details.iteritems():
section_measurements.append({'name': k, 'value': v})
lib_size += v