Skip to content

Commit 46785ae

Browse files
committed
Bug 1694161 - run non-unified sanity targeting MacOS. r=firefox-build-system-reviewers,mhentges
Differential Revision: https://phabricator.services.mozilla.com/D105977
1 parent c0dc6e8 commit 46785ae

File tree

2 files changed

+66
-4
lines changed

2 files changed

+66
-4
lines changed

taskcluster/ci/source-test/clang.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ job-defaults:
2323
tooltool-downloads: public
2424
fetches:
2525
toolchain:
26-
- linux64-clang
27-
- linux64-rust
2826
- linux64-cbindgen
2927
- linux64-nasm
3028
- linux64-node
@@ -53,7 +51,9 @@ tidy:
5351
./mach --log-no-times static-analysis check --outgoing --output $HOME/clang-tidy.json --format json
5452
fetches:
5553
toolchain:
54+
- linux64-clang
5655
- linux64-clang-tidy
56+
- linux64-rust
5757
worker:
5858
artifacts:
5959
- type: file
@@ -72,7 +72,9 @@ format:
7272
./mach --log-no-times clang-format --outgoing --output $HOME/clang-format.diff --format diff
7373
fetches:
7474
toolchain:
75+
- linux64-clang
7576
- linux64-clang-tidy
77+
- linux64-rust
7678
worker:
7779
artifacts:
7880
- type: file
@@ -93,17 +95,19 @@ external:
9395
./mach --log-no-times static-analysis check --checks="-*,mozilla-civet-*" --outgoing --output $HOME/clang-tidy.json --format json
9496
fetches:
9597
toolchain:
98+
- linux64-clang
9699
- linux64-clang-tidy-external
100+
- linux64-rust
97101
worker:
98102
artifacts:
99103
- type: file
100104
name: public/code-review/clang-tidy.json
101105
path: /builds/worker/clang-tidy.json
102106

103-
non-unified:
107+
linux64-non-unified:
104108
description: Run syntax test for non-unified build on C/C++ files.
105109
treeherder:
106-
symbol: cpp(non-unified)
110+
symbol: cpp(non-unified-linux64)
107111
tier: 1
108112
attributes:
109113
code-review: false
@@ -115,4 +119,28 @@ non-unified:
115119
taskcluster/scripts/misc/source-test-clang-non-unified.sh
116120
fetches:
117121
toolchain:
122+
- linux64-clang
118123
- linux64-clang-tidy
124+
- linux64-rust
125+
126+
macosx64-non-unified:
127+
description: Run syntax test for non-unified build on C/C++ files.
128+
treeherder:
129+
symbol: cpp(non-unified-macos64)
130+
tier: 1
131+
attributes:
132+
code-review: false
133+
run-on-projects: ['integration']
134+
run:
135+
cwd: '{checkout}'
136+
command: >-
137+
source taskcluster/scripts/misc/source-test-clang-setup-macos64.sh &&
138+
taskcluster/scripts/misc/source-test-clang-non-unified.sh
139+
fetches:
140+
toolchain:
141+
- linux64-llvm-dsymutil
142+
- linux64-rust-macos
143+
- linux64-rust-size
144+
- linux64-cctools-port
145+
- linux64-clang-macosx-cross
146+
- macosx64-sdk-10.12
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
source $HOME/checkouts/gecko/taskcluster/scripts/misc/source-test-common.sh
3+
4+
# Add clang-tidy to PATH
5+
export PATH=$MOZ_FETCHES_DIR/clang-tidy/bin:$PATH
6+
export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/llvm-dsymutil/bin:$PATH
7+
8+
# Use toolchain clang
9+
export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib
10+
11+
# Write custom mozconfig
12+
export MOZCONFIG=$GECKO_PATH/mozconfig
13+
14+
# Add to mozconfig all the appropriate options
15+
cat <<EOT >> $MOZCONFIG
16+
# Enable debug mode
17+
ac_add_options --enable-debug
18+
# Enable GC zeal, a testing and debugging feature that helps find GC-related bugs in JSAPI applications.
19+
ac_add_options --enable-gczeal
20+
# Do not treat warnings as errors
21+
ac_add_options --disable-warnings-as-errors
22+
23+
export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX10.12.sdk
24+
25+
export DSYMUTIL=$GECKO_PATH/build/macosx/llvm-dsymutil
26+
mk_add_options "export REAL_DSYMUTIL=$MOZ_FETCHES_DIR/llvm-dsymutil/bin/dsymutil"
27+
28+
ac_add_options --target=x86_64-apple-darwin
29+
30+
EOT
31+
32+
# Mach lookup clang-tidy in clang-tools
33+
mkdir -p $MOZBUILD_STATE_PATH/clang-tools
34+
ln -s $MOZ_FETCHES_DIR/clang-tidy $MOZBUILD_STATE_PATH/clang-tools/clang-tidy

0 commit comments

Comments
 (0)