diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-19 02:50:32 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-19 02:50:32 +0200 |
| commit | 243ef3763a7a93f1ab783afbc847f7783f539f4c (patch) | |
| tree | 9f8d8a66017eb952a7d5a940287c79055a5811c8 /community/julia/fix-or-disable-broken-tests.patch | |
| parent | 89182e0a43c4e4beac1bb5d9f87d267bc62eed6a (diff) | |
| download | aports-243ef3763a7a93f1ab783afbc847f7783f539f4c.tar.bz2 aports-243ef3763a7a93f1ab783afbc847f7783f539f4c.tar.xz | |
Revert "community/julia: upgrade to 0.6.0"
This reverts commit 89182e0a43c4e4beac1bb5d9f87d267bc62eed6a.
Sorry, I somehow messed up merging...
Diffstat (limited to 'community/julia/fix-or-disable-broken-tests.patch')
| -rw-r--r-- | community/julia/fix-or-disable-broken-tests.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/community/julia/fix-or-disable-broken-tests.patch b/community/julia/fix-or-disable-broken-tests.patch index be82b33d29..fffadfb462 100644 --- a/community/julia/fix-or-disable-broken-tests.patch +++ b/community/julia/fix-or-disable-broken-tests.patch @@ -22,37 +22,37 @@ test/read.jl: ditto. close(p) --- a/test/Makefile +++ b/test/Makefile -@@ -6,7 +6,7 @@ +@@ -4,7 +4,7 @@ + include $(JULIAHOME)/Make.inc + # TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE + +-TESTS = all linalg $(filter-out TestHelpers runtests testdefs,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl))) ++TESTS = all linalg $(filter-out TestHelpers runtests testdefs libdl,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl))) + + default: all - TESTGROUPS = linalg sparse unicode strings dates - TESTS = all $(TESTGROUPS) \ -- $(filter-out TestHelpers runtests testdefs, \ -+ $(filter-out TestHelpers runtests testdefs libdl, \ - $(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl))) \ - $(foreach group,$(TESTGROUPS), \ - $(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/$(group)/*.jl))) --- a/test/cmdlineargs.jl +++ b/test/cmdlineargs.jl -@@ -404,7 +404,7 @@ +@@ -301,7 +301,7 @@ bt = readstring(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --precompiled=$precomp -E 'include("____nonexistent_file")'`), stderr=catcmd)) - @test contains(bt, "include_from_node1") + @test contains(bt, "in include_from_node1") - if is_windows() && Sys.WORD_SIZE == 32 && precomp == "yes" + if ((is_windows() && Sys.WORD_SIZE == 32) || is_linux()) && precomp == "yes" # fixme, issue #17251 - @test_broken contains(bt, "include_from_node1(::String) at $(joinpath(".","loading.jl"))") + @test_broken contains(bt, "in include_from_node1(::String) at $(joinpath(".","loading.jl"))") else --- a/test/choosetests.jl +++ b/test/choosetests.jl -@@ -32,7 +32,7 @@ - "replutil", "sets", "test", "goto", "llvmcall", "llvmcall2", "grisu", +@@ -31,7 +31,7 @@ + "replutil", "sets", "test", "goto", "llvmcall", "grisu", "nullable", "meta", "stacktraces", "profile", "libgit2", "docs", "markdown", "base64", "serialize", "misc", "threads", - "enums", "cmdlineargs", "i18n", "workspace", "libdl", "int", + "enums", "cmdlineargs", "i18n", "workspace", "int", - "checked", "intset", "floatfuncs", "compile", "distributed", "inline", - "boundscheck", "error", "ambiguous", "cartesian", "asmvariant", "osutils", - "channels", "iostream", "specificity" + "checked", "intset", "floatfuncs", "compile", "parallel", "inline", + "boundscheck", "error", "ambiguous", "cartesian" + ] --- a/test/file.jl +++ b/test/file.jl @@ -174,8 +174,8 @@ |