Skip to content

Commit bbfdb56

Browse files
committed
travis: Use hide_output in dist-powerpc64-linux
Looks like we blew the 4MB cap, so let's hide some more output.
1 parent ec829fe commit bbfdb56

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ USER rustbuild
6161
WORKDIR /tmp
6262

6363
COPY patches/ /tmp/patches/
64-
COPY powerpc64-linux-gnu.config build-powerpc64-toolchain.sh /tmp/
64+
COPY shared.sh powerpc64-linux-gnu.config build-powerpc64-toolchain.sh /tmp/
6565
RUN ./build-powerpc64-toolchain.sh
6666

6767
USER root

src/ci/docker/dist-powerpc64-linux/build-powerpc64-toolchain.sh

+1-16
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,7 @@
1111

1212
set -ex
1313

14-
hide_output() {
15-
set +x
16-
on_err="
17-
echo ERROR: An error was encountered with the build.
18-
cat /tmp/build.log
19-
exit 1
20-
"
21-
trap "$on_err" ERR
22-
bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
23-
PING_LOOP_PID=$!
24-
$@ &> /tmp/build.log
25-
rm /tmp/build.log
26-
trap - ERR
27-
kill $PING_LOOP_PID
28-
set -x
29-
}
14+
source shared.sh
3015

3116
mkdir build
3217
cd build

src/ci/docker/dist-powerpc64-linux/build-powerpc64le-toolchain.sh

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
set -ex
1313

14+
source shared.sh
15+
1416
BINUTILS=2.25.1
1517
GCC=5.3.0
1618
TARGET=powerpc64le-linux-gnu
@@ -40,9 +42,9 @@ pushd binutils-$TARGET
4042
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.bz2 | tar xjf -
4143
mkdir binutils-build
4244
cd binutils-build
43-
../binutils-$BINUTILS/configure --target=$TARGET --with-sysroot=$SYSROOT
44-
make -j10
45-
make install
45+
hide_output ../binutils-$BINUTILS/configure --target=$TARGET --with-sysroot=$SYSROOT
46+
hide_output make -j10
47+
hide_output make install
4648
popd
4749
rm -rf binutils-$TARGET
4850

@@ -51,11 +53,11 @@ mkdir gcc-$TARGET
5153
pushd gcc-$TARGET
5254
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
5355
cd gcc-$GCC
54-
./contrib/download_prerequisites
56+
hide_output ./contrib/download_prerequisites
5557

5658
mkdir ../gcc-build
5759
cd ../gcc-build
58-
../gcc-$GCC/configure \
60+
hide_output ../gcc-$GCC/configure \
5961
--enable-languages=c,c++ \
6062
--target=$TARGET \
6163
--with-cpu=power8 \
@@ -72,8 +74,8 @@ cd ../gcc-build
7274
--disable-libsanitizer \
7375
--disable-libquadmath-support \
7476
--disable-lto
75-
make -j10
76-
make install
77+
hide_output hide_output make -j10
78+
hide_output make install
7779

7880
popd
7981
rm -rf gcc-$TARGET
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
# file at the top-level directory of this distribution and at
3+
# http://rust-lang.org/COPYRIGHT.
4+
#
5+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
# option. This file may not be copied, modified, or distributed
9+
# except according to those terms.
10+
11+
hide_output() {
12+
set +x
13+
on_err="
14+
echo ERROR: An error was encountered with the build.
15+
cat /tmp/build.log
16+
exit 1
17+
"
18+
trap "$on_err" ERR
19+
bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
20+
PING_LOOP_PID=$!
21+
$@ &> /tmp/build.log
22+
trap - ERR
23+
kill $PING_LOOP_PID
24+
set -x
25+
}

0 commit comments

Comments
 (0)