Skip to content

Commit 41a89d0

Browse files
author
Jorge Aparicio
committed
use the gist crate
but not on OSX because it doesn't work there
1 parent 5c9bfab commit 41a89d0

File tree

3 files changed

+21
-26
lines changed

3 files changed

+21
-26
lines changed

appveyor.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ test_script:
2121

2222
on_success:
2323
- cmd: |
24-
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
25-
dumpbin /disasm target/release/librustc_builtins.rlib |
26-
gist -d "'%TARGET%/rustc-builtins.rlib' from commit '%APPVEYOR_REPO_COMMIT%' on branch '%APPVEYOR_REPO_branch%'"
24+
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
25+
dumpbin /disasm target/release/librustc_builtins.rlib | gist -d "'%TARGET%/rustc-builtins.rlib' from commit '%APPVEYOR_REPO_COMMIT%' on branch '%APPVEYOR_REPO_branch%'"
2726
2827
branches:
2928
only:

ci/install.sh

-12
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,13 @@ install_xargo() {
4242
fi
4343
}
4444

45-
install_wgetpaste() {
46-
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
47-
brew install wgetpaste
48-
else
49-
curl -O http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2
50-
tar -xvf wgetpaste-2.28.tar.bz2
51-
sudo mv ./wgetpaste-2.28/wgetpaste /usr/bin
52-
rm -r wgetpaste-2.28*
53-
fi
54-
}
55-
5645
main() {
5746
if [[ $TRAVIS_OS_NAME == "osx" || ${IN_DOCKER_CONTAINER:-n} == "y" ]]; then
5847
install_qemu
5948
install_binutils
6049
install_rust
6150
add_rustup_target
6251
install_xargo
63-
install_wgetpaste
6452
fi
6553
}
6654

ci/script.sh

+19-11
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ set -ex
22

33
. $(dirname $0)/env.sh
44

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'"
77
echo "Disassembly available at the above URL."
88
}
99

@@ -16,18 +16,24 @@ inspect() {
1616
$PREFIX$NM -g --defined-only target/**/debug/*.rlib
1717

1818
set +e
19-
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist "$TARGET/rustc-builtins.rlib"
20-
set -e
21-
22-
# Check presence of weak symbols
2319
case $TRAVIS_OS_NAME in
2420
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
2925
;;
3026
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+
3137
}
3238

3339
run_tests() {
@@ -43,12 +49,14 @@ run_tests() {
4349

4450
main() {
4551
if [[ $TRAVIS_OS_NAME == "linux" && ${IN_DOCKER_CONTAINER:-n} == "n" ]]; then
46-
local tag=2016-08-13
52+
local tag=2016-08-22
4753

4854
docker run \
4955
--privileged \
5056
-e IN_DOCKER_CONTAINER=y \
5157
-e TARGET=$TARGET \
58+
-e TRAVIS_BRANCH=$TRAVIS_BRANCH \
59+
-e TRAVIS_COMMIT=$TRAVIS_COMMIT \
5260
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
5361
-v $(pwd):/mnt \
5462
japaric/rustc-builtins:$tag \

0 commit comments

Comments
 (0)