Skip to content

Commit 4c908a9

Browse files
committed
Enable profiler selectively on some builders
1 parent 95c6fc4 commit 4c908a9

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ matrix:
5454
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
5555
- env: >
5656
RUST_CHECK_TARGET=check
57-
RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers"
57+
RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler"
5858
SRC=.
5959
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
6060
SCCACHE_ERROR_LOG=/tmp/sccache.log
@@ -87,7 +87,7 @@ matrix:
8787
# OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
8888
- env: >
8989
RUST_CHECK_TARGET=dist
90-
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-extended"
90+
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-extended --enable-profiler"
9191
SRC=.
9292
DEPLOY=1
9393
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -101,7 +101,7 @@ matrix:
101101
- *osx_install_sccache
102102
- env: >
103103
RUST_CHECK_TARGET=dist
104-
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended --enable-sanitizers"
104+
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended --enable-sanitizers --enable-profiler"
105105
SRC=.
106106
DEPLOY=1
107107
RUSTC_RETRY_LINKER_ON_SEGFAULT=1

appveyor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ environment:
77
matrix:
88
# 32/64 bit MSVC tests
99
- MSYS_BITS: 64
10-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
10+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
1111
SCRIPT: python x.py test
1212
- MSYS_BITS: 32
1313
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --target=i586-pc-windows-msvc
@@ -48,24 +48,26 @@ environment:
4848
- RUST_CONFIGURE_ARGS: >
4949
--build=x86_64-pc-windows-msvc
5050
--enable-extended
51+
--enable-profiler
5152
SCRIPT: python x.py dist
5253
DEPLOY: 1
5354
- RUST_CONFIGURE_ARGS: >
5455
--build=i686-pc-windows-msvc
5556
--target=i586-pc-windows-msvc
5657
--enable-extended
58+
--enable-profiler
5759
SCRIPT: python x.py dist
5860
DEPLOY: 1
5961
- MSYS_BITS: 32
60-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended
62+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended --enable-profiler
6163
SCRIPT: python x.py dist
6264
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
6365
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6466
MINGW_DIR: mingw32
6567
DEPLOY: 1
6668
- MSYS_BITS: 64
6769
SCRIPT: python x.py dist
68-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended
70+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended --enable-profiler
6971
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
7072
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
7173
MINGW_DIR: mingw64

src/ci/docker/dist-i686-linux/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ ENV HOSTS=i686-unknown-linux-gnu
9090
ENV RUST_CONFIGURE_ARGS \
9191
--host=$HOSTS \
9292
--enable-extended \
93-
--enable-sanitizers
93+
--enable-sanitizers \
94+
--enable-profiler
9495
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
9596

9697
# This is the only builder which will create source tarballs

src/ci/docker/dist-x86_64-linux/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ ENV HOSTS=x86_64-unknown-linux-gnu
9090
ENV RUST_CONFIGURE_ARGS \
9191
--host=$HOSTS \
9292
--enable-extended \
93-
--enable-sanitizers
93+
--enable-sanitizers \
94+
--enable-profiler
9495
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
9596

9697
# This is the only builder which will create source tarballs

src/ci/docker/x86_64-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2222
rm dumb-init_*.deb
2323
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2424

25-
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-sanitizers
25+
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-sanitizers --enable-profiler
2626
ENV SCRIPT python2.7 ../x.py test

src/ci/run.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
3232
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"
3333
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-openssl-static"
3434
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-clean-rebuild"
35-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-profiler"
3635

3736
if [ "$DIST_SRC" = "" ]; then
3837
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src"

0 commit comments

Comments
 (0)