Skip to content

Commit f7f6438

Browse files
committed
less verbose and allow non-master check fail
Upstream doesn't guarantee configure file matches across platform and versions. Checking configure file can fail easily. Signed-off-by: Jay Lee <[email protected]>
1 parent 340f62e commit f7f6438

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ language: rust
22
rust: nightly
33
services: docker
44

5+
jobs:
6+
allow_failures:
7+
- if: branch != master
8+
env: JEMALLOC_SYS_VERIFY_CONFIGURE=1
9+
510
matrix:
611
include:
712
# Linux

ci/run.sh

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ fi
5555

5656
if [ "${TARGET}" = "x86_64-unknown-linux-gnu" ] || [ "${TARGET}" = "x86_64-apple-darwin" ]
5757
then
58-
${CARGO_CMD} build -vv --target "${TARGET}" 2>&1 | tee build_no_std.txt
58+
# Not using tee to avoid too much logs that exceeds travis' limit.
59+
if ! ${CARGO_CMD} build -vv --target "${TARGET}" &> build_no_std.txt; then
60+
tail -n 1024 build_no_std.txt
61+
exit 1
62+
fi
5963

6064
# Check that the no-std builds are not linked against a libc with default
6165
# features or the `use_std` feature enabled:
@@ -71,42 +75,42 @@ then
7175
done
7276
fi
7377

74-
${CARGO_CMD} test -vv --target "${TARGET}"
78+
${CARGO_CMD} test --target "${TARGET}"
7579

7680
if [ "${JEMALLOC_SYS_GIT_DEV_BRANCH}" = "1" ]; then
7781
# FIXME: profiling tests broken on dev-branch
7882
# https://github.com/jemalloc/jemalloc/issues/1477
7983
:
8084
else
81-
${CARGO_CMD} test -vv --target "${TARGET}" --features profiling
85+
${CARGO_CMD} test --target "${TARGET}" --features profiling
8286
fi
8387

84-
${CARGO_CMD} test -vv --target "${TARGET}" --features debug
85-
${CARGO_CMD} test -vv --target "${TARGET}" --features stats
88+
${CARGO_CMD} test --target "${TARGET}" --features debug
89+
${CARGO_CMD} test --target "${TARGET}" --features stats
8690
if [ "${JEMALLOC_SYS_GIT_DEV_BRANCH}" = "1" ]; then
8791
# FIXME: profiling tests broken on dev-branch
8892
# https://github.com/jemalloc/jemalloc/issues/1477
8993
:
9094
else
91-
${CARGO_CMD} test -vv --target "${TARGET}" --features 'debug profiling'
95+
${CARGO_CMD} test --target "${TARGET}" --features 'debug profiling'
9296
fi
9397

94-
${CARGO_CMD} test -vv --target "${TARGET}" \
98+
${CARGO_CMD} test --target "${TARGET}" \
9599
--features unprefixed_malloc_on_supported_platforms
96-
${CARGO_CMD} test -vv --target "${TARGET}" --no-default-features
97-
${CARGO_CMD} test -vv --target "${TARGET}" --no-default-features \
100+
${CARGO_CMD} test --target "${TARGET}" --no-default-features
101+
${CARGO_CMD} test --target "${TARGET}" --no-default-features \
98102
--features background_threads_runtime_support
99103

100104
if [ "${NOBGT}" = "1" ]
101105
then
102106
echo "enabling background threads by default at run-time is not tested"
103107
else
104-
${CARGO_CMD} test -vv --target "${TARGET}" --features background_threads
108+
${CARGO_CMD} test --target "${TARGET}" --features background_threads
105109
fi
106110

107-
${CARGO_CMD} test -vv --target "${TARGET}" --release
108-
${CARGO_CMD} test -vv --target "${TARGET}" --manifest-path jemalloc-sys/Cargo.toml
109-
${CARGO_CMD} test -vv --target "${TARGET}" \
111+
${CARGO_CMD} test --target "${TARGET}" --release
112+
${CARGO_CMD} test --target "${TARGET}" --manifest-path jemalloc-sys/Cargo.toml
113+
${CARGO_CMD} test --target "${TARGET}" \
110114
--manifest-path jemalloc-sys/Cargo.toml \
111115
--features unprefixed_malloc_on_supported_platforms
112116

@@ -116,26 +120,26 @@ case "${TARGET}" in
116120
"x86_64-unknown-linux-musl") ;;
117121
*)
118122

119-
${CARGO_CMD} test -vv --target "${TARGET}" \
123+
${CARGO_CMD} test --target "${TARGET}" \
120124
--manifest-path jemalloc-ctl/Cargo.toml \
121125
--no-default-features
122126
# FIXME: cross fails to pass features to jemalloc-ctl
123-
# ${CARGO_CMD} test -vv --target "${TARGET}" \
127+
# ${CARGO_CMD} test --target "${TARGET}" \
124128
# --manifest-path jemalloc-ctl \
125129
# --no-default-features --features use_std
126130
;;
127131
esac
128132

129-
${CARGO_CMD} test -vv --target "${TARGET}" -p systest
130-
${CARGO_CMD} test -vv --target "${TARGET}" \
133+
${CARGO_CMD} test --target "${TARGET}" -p systest
134+
${CARGO_CMD} test --target "${TARGET}" \
131135
--manifest-path jemallocator-global/Cargo.toml
132-
${CARGO_CMD} test -vv --target "${TARGET}" \
136+
${CARGO_CMD} test --target "${TARGET}" \
133137
--manifest-path jemallocator-global/Cargo.toml \
134138
--features force_global_jemalloc
135139

136140
# FIXME: Re-enable following test when allocator API is stable again.
137141
# if [ "${TRAVIS_RUST_VERSION}" = "nightly" ]
138142
# then
139143
# # The Alloc trait is unstable:
140-
# ${CARGO_CMD} test -vv --target "${TARGET}" --features alloc_trait
144+
# ${CARGO_CMD} test --target "${TARGET}" --features alloc_trait
141145
# fi

0 commit comments

Comments
 (0)