Merge pull request #16210 from JuliaLang/tk/osxtravis

Also skip linalg/triangular on osx travis
JuliaLang · May 6, 2016 · fcb41d5 · fcb41d5
2 parents 775dc82 + 7b7b455
commit fcb41d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/base/unicode/utf8.jl b/base/unicode/utf8.jl
@@ -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`

diff --git a/test/subarray.jl b/test/subarray.jl
@@ -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])
-Original file line number
+Diff line change
@@ Expand Up @@
         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 @@