Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also skip linalg/triangular on osx travis #16210

Merged
merged 3 commits into from
May 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ before_install:
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib";
make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make;
TESTSTORUN="all --skip subarray"; fi # TODO: re enable this if possible without timing out
TESTSTORUN="all --skip linalg/triangular subarray"; fi # TODO: re enable these if possible without timing out
- git clone -q git://git.kitenet.net/moreutils
script:
- make -C moreutils mispipe
Expand Down
1 change: 0 additions & 1 deletion base/unicode/utf8.jl
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ function convert(::Type{String}, a::Vector{UInt8}, invalids_as::AbstractString)
end
String(a)
end
convert(::Type{String}, s::AbstractString) = utf8(bytestring(s))

"""
Converts an already validated vector of `UInt16` or `UInt32` to a `String`
Expand Down
4 changes: 4 additions & 0 deletions test/subarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -471,3 +471,7 @@ let A = rand(10), sA = sub(copy(A), :)
permute!(sA, collect(Int16, 1:10))
@test A == sA
end

# the following segfaults with LLVM 3.8 on Windows, ref #15417
@test collect(sub(sub(reshape(1:13^3, 13, 13, 13), 3:7, 6, :), 1:2:5, :, 1:2:5)) ==
cat(3,[68,70,72],[406,408,410],[744,746,748])