Skip to content
This repository was archived by the owner on Nov 24, 2020. It is now read-only.

Commit 5ba6a3b

Browse files
committed
Compare 0.6.1 backports against 0.6.0 release
1 parent f939082 commit 5ba6a3b

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

scripts/setup.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ echo "verbose = off" >> ~/.wgetrc
5050
sudo apt-get update # Pull in latest versions
5151
sudo apt-get upgrade # Upgrade system packages
5252
# Use first argument to script to distinguish between the versions
53-
if [ "$1" == "0.7" ]
53+
if [ "$2" == "LZ" ]
5454
then
55-
# Nightly
56-
wget -O julia.tar.gz https://julialangnightlies-s3.julialang.org/bin/linux/x64/julia-latest-linux64.tar.gz
55+
# backport
56+
wget -O julia.tar.gz https://s3.amazonaws.com/julialangnightlies/buildog/bin/linux/x64/0.6/julia-9b348ff635-linux64.tar.gz
5757
else
58-
wget -O julia.tar.gz https://julialang-s3.julialang.org/bin/linux/x64/${1}/julia-${1}-latest-linux-x86_64.tar.gz
58+
wget -O julia.tar.gz https://julialang-s3.julialang.org/bin/linux/x64/0.6/julia-0.6-latest-linux-x86_64.tar.gz
5959
fi
6060
mkdir julia
6161
tar -zxf julia.tar.gz -C ./julia --strip-components=1
@@ -135,15 +135,15 @@ julia -e "Pkg.init(); println(Pkg.dir())"
135135

136136
#######################################################################
137137
# Run PackageEvaluator
138-
if [ "$2" == "all" ]
138+
if [ "$1" == "0.4" ]
139139
then
140-
LOOPOVER=/home/vagrant/.julia/v${1}/METADATA/*
141-
elif [ "$2" == "AK" ]
140+
LOOPOVER=/home/vagrant/.julia/v0.6/METADATA/[A-F,a-f]*
141+
elif [ "$1" == "0.5" ]
142142
then
143-
LOOPOVER=/home/vagrant/.julia/v${1}/METADATA/[A-K,a-k]*;
144-
elif [ "$2" == "LZ" ]
143+
LOOPOVER=/home/vagrant/.julia/v0.6/METADATA/[G-N,g-n]*;
144+
elif [ "$1" == "0.6" ]
145145
then
146-
LOOPOVER=/home/vagrant/.julia/v${1}/METADATA/[L-Z,l-z]*;
146+
LOOPOVER=/home/vagrant/.julia/v0.6/METADATA/[O-Z,o-z]*;
147147
fi
148148
# For every package name...
149149
for f in $LOOPOVER;

src/preptest.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function prepare_test()
3838
if get(PKGOPTS, pkg_name, :NORMAL) == :XVFB
3939
print(fp, "xvfb-run ")
4040
end
41-
print(fp, "$TIMEOUTPATH -s 9 900s ")
41+
print(fp, "$TIMEOUTPATH -s 9 2400s ")
4242
print(fp, "julia -e 'versioninfo(true); Pkg.test(\"", pkg_name, "\")'")
4343
print(fp, " 2>&1 | tee PKGEVAL_", pkg_name, "_test.log")
4444
close(fp)

0 commit comments

Comments
 (0)