2
2
3
3
. $( dirname $0 ) /env.sh
4
4
5
- gist () {
6
- wgetpaste -s gists -d " '$1 ' from commit '$TRAVIS_COMMIT ' on branch '$TRAVIS_BRANCH '"
5
+ gist_it () {
6
+ gist -ap -f " '$1 ' from commit '$TRAVIS_COMMIT ' on branch '$TRAVIS_BRANCH '"
7
7
echo " Disassembly available at the above URL."
8
8
}
9
9
@@ -16,18 +16,24 @@ inspect() {
16
16
$PREFIX$NM -g --defined-only target/** /debug/* .rlib
17
17
18
18
set +e
19
- $PREFIX$OBJDUMP -Cd target/** /release/* .rlib | gist " $TARGET /rustc-builtins.rlib"
20
- set -e
21
-
22
- # Check presence of weak symbols
23
19
case $TRAVIS_OS_NAME in
24
20
linux)
25
- local symbols=( memcmp memcpy memmove memset )
26
- for symbol in " ${symbols[@]} " ; do
27
- $PREFIX$NM target/ ** /debug/deps/librlibc * .rlib | grep -q " W $symbol "
28
- done
21
+ $PREFIX$OBJDUMP -Cd target/ ** /release/ * .rlib | gist_it " $TARGET /rustc-builtins.rlib "
22
+ ;;
23
+ osx)
24
+ $PREFIX$OBJDUMP -Cd target/ ** /release/ * .rlib
29
25
;;
30
26
esac
27
+ set -e
28
+
29
+ # Check presence of weak symbols
30
+ if [[ $TRAVIS_OS_NAME = " linux" ]]; then
31
+ local symbols=( memcmp memcpy memmove memset )
32
+ for symbol in " ${symbols[@]} " ; do
33
+ $PREFIX$NM target/** /debug/deps/librlibc* .rlib | grep -q " W $symbol "
34
+ done
35
+ fi
36
+
31
37
}
32
38
33
39
run_tests () {
@@ -43,12 +49,14 @@ run_tests() {
43
49
44
50
main () {
45
51
if [[ $TRAVIS_OS_NAME == " linux" && ${IN_DOCKER_CONTAINER:- n} == " n" ]]; then
46
- local tag=2016-08-13
52
+ local tag=2016-08-22
47
53
48
54
docker run \
49
55
--privileged \
50
56
-e IN_DOCKER_CONTAINER=y \
51
57
-e TARGET=$TARGET \
58
+ -e TRAVIS_BRANCH=$TRAVIS_BRANCH \
59
+ -e TRAVIS_COMMIT=$TRAVIS_COMMIT \
52
60
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
53
61
-v $( pwd) :/mnt \
54
62
japaric/rustc-builtins:$tag \
0 commit comments