Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Backed out changeset 081d8311be59 (bug 1479503) for build bustage - j…
Browse files Browse the repository at this point in the history
…ava not found. CLOSED TREE
  • Loading branch information
ncsoregi committed Sep 12, 2018
1 parent d2b8a69 commit 8cf0564
Show file tree
Hide file tree
Showing 30 changed files with 106 additions and 1,242 deletions.
1 change: 0 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ exclude =
testing/mochitest/pywebsocket,
tools/lint/test/files,
build/build-infer/build-infer.py,
tools/infer/test/*.configure,
1 change: 0 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ _OPT\.OBJ/

# Gradle cache.
^.gradle/
^tools/infer/test/.gradle/

# Local Gradle configuration properties.
^local.properties$
Expand Down
10 changes: 0 additions & 10 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -567,16 +567,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags)

check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)

@depends(host)
def include_infer_autotest(host):
# Do not include autotest configuration on Windows or macos
# because infer is not available there
if host.os in ['WINNT', 'OSX']:
return None
return 'tools/infer/test/moz.configure'

include(include_infer_autotest)

# Fallthrough to autoconf-based configure
include('build/moz.configure/old.configure')

Expand Down
234 changes: 58 additions & 176 deletions python/mozbuild/mozbuild/mach_commands.py

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions taskcluster/ci/docker-image/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ jobs:
fetch:
symbol: I(fetch)
parent: debian9-base
static-analysis-build:
symbol: I(static-analysis-build)
parent: android-build
infer-build:
symbol: I(infer)
parent: debian9-base
mingw32-build:
symbol: I(mingw)
parent: debian9-base
Expand Down
4 changes: 0 additions & 4 deletions taskcluster/ci/static-analysis-autotest/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
description: "Linux64 Debug Static Analysis Autotest"
index:
job-name: linux64-st-autotest-debug
worker:
docker-image: {in-tree: static-analysis-build}
env:
PERFHERDER_EXTRA_OPTIONS: static-analysis-autotest
treeherder:
platform: linux64/debug
worker-type: aws-provisioner-v1/gecko-t-linux-large
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/ci/toolchain/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ linux64-infer:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
docker-image: {in-tree: static-analysis-build}
docker-image: {in-tree: infer-build}
max-run-time: 3600
run:
using: toolchain-script
Expand Down
30 changes: 30 additions & 0 deletions taskcluster/docker/infer-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# %ARG DOCKER_IMAGE_PARENT
FROM $DOCKER_IMAGE_PARENT
MAINTAINER Robert Bartlensky <rbartlensky@mozilla.com>

VOLUME /builds/worker/checkouts
VOLUME /builds/worker/workspace
VOLUME /builds/worker/tooltool-cache

ENV XZ_OPT=-T0

RUN apt-get update && \
apt-get install \
autoconf \
bison \
bzip2 \
flex \
curl \
git \
opam \
libsqlite3-dev \
autoconf \
automake \
cmake \
libc6-dev \
openjdk-8-jdk-headless \
pkg-config \
patch \
tar \
unzip \
zlib1g-dev
58 changes: 0 additions & 58 deletions taskcluster/docker/static-analysis-build/Dockerfile

This file was deleted.

1 change: 1 addition & 0 deletions testing/mozharness/mozharness/base/script.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

#!/usr/bin/env python
# ***** BEGIN LICENSE BLOCK *****
# This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
30 changes: 10 additions & 20 deletions testing/mozharness/mozharness/mozilla/building/buildbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -1226,15 +1226,13 @@ def build(self):
def static_analysis_autotest(self):
"""Run mach static-analysis autotest, in order to make sure we dont regress"""
self.preflight_build()
self._run_mach_command_in_build_env(['configure'])
self._run_mach_command_in_build_env(['static-analysis', 'autotest',
'--intree-tool'],
use_subprocess=True)
self._run_mach_command_in_build_env(['static-analysis', 'autotest', '--intree-tool'])

def _run_mach_command_in_build_env(self, args, use_subprocess=False):
def _run_mach_command_in_build_env(self, args):
"""Run a mach command in a build context."""
env = self.query_build_env()
env.update(self.query_mach_build_env())

dirs = self.query_abs_dirs()

if 'MOZILLABUILD' in os.environ:
Expand All @@ -1247,21 +1245,13 @@ def _run_mach_command_in_build_env(self, args, use_subprocess=False):
else:
mach = [sys.executable, 'mach']

# XXX See bug 1483883
# Work around an interaction between Gradle and mozharness
# Not using `subprocess` causes gradle to hang
if use_subprocess:
import subprocess
return_code = subprocess.call(mach + ['--log-no-times'] + args,
env=env, cwd=dirs['abs_src_dir'])
else:
return_code = self.run_command(
command=mach + ['--log-no-times'] + args,
cwd=dirs['abs_src_dir'],
env=env,
output_timeout=self.config.get('max_build_output_timeout',
60 * 40)
)
return_code = self.run_command(
command=mach + ['--log-no-times'] + args,
cwd=dirs['abs_src_dir'],
env=env,
output_timeout=self.config.get('max_build_output_timeout', 60 * 40)
)

if return_code:
self.return_code = self.worst_level(
EXIT_STATUS_DICT[TBPL_FAILURE], self.return_code,
Expand Down
14 changes: 3 additions & 11 deletions tools/infer/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,19 @@ target: obj-x86_64-pc-linux-gnu
platforms:
- linux64
infer_checkers:
# no issues were ever trigger by this
- name: check-nullable
publish: !!bool no
- name: biabduction
publish: !!bool yes
# very very noisy
# it could be useful, but it won't be part of the default enabled checkers
- name: eradicate
publish: !!bool no
# hard to use, not useful
- name: quandary
publish: !!bool no
publish: !!bool yes
- name: starvation
publish: !!bool yes
# experimental
- name: litho
publish: !!bool no
publish: !!bool yes
- name: racerd
publish: !!bool yes
# I think this is only for c++, can't trigger these errors in Java
- name: liveness
publish: !!bool no
publish: !!bool yes
# Third party files from mozilla-central
third_party: tools/rewriting/ThirdPartyPaths.txt
23 changes: 0 additions & 23 deletions tools/infer/test/autotest/build.gradle

This file was deleted.

22 changes: 0 additions & 22 deletions tools/infer/test/autotest/src/main/java/Biabduction.java

This file was deleted.

114 changes: 0 additions & 114 deletions tools/infer/test/autotest/src/main/java/Biabduction.json

This file was deleted.

Loading

0 comments on commit 8cf0564

Please sign in to comment.