Skip to content

Commit b78112e

Browse files
committed
Fixes for 0.7.
1 parent 96ab9f3 commit b78112e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/mpi-op.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ function user_op(opfunc::Function)
5151
return _user_op
5252
end
5353

54-
# use function types in Julia 0.5 to automatically use built-in
54+
# use function types in Julia 0.7 to automatically use built-in
5555
# MPI operations for the corresponding Julia functions.
5656
for (f,op) in ((+,SUM), (*,PROD),
5757
(min,MIN), (max,MAX),
58-
(&, BAND), (|, BOR), ($, BXOR))
58+
(&, BAND), (|, BOR), (, BXOR))
5959
@eval user_op(::$(typeof(f))) = $op
6060
end
6161

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using Base.Test
33

44
using Compat
55
import Compat.String
6+
import Compat.Sys: BINDIR
67

78
# Code coverage command line options; must correspond to src/julia.h
89
# and src/ui/repl.c
@@ -21,7 +22,7 @@ singlefiles = []
2122

2223
function runtests()
2324
nprocs = clamp(Sys.CPU_CORES, 2, 4)
24-
exename = joinpath(JULIA_HOME, Base.julia_exename())
25+
exename = joinpath(BINDIR, Base.julia_exename())
2526
testdir = dirname(@__FILE__)
2627
istest(f) = endswith(f, ".jl") && startswith(f, "test_")
2728
testfiles = sort(filter(istest, readdir(testdir)))

0 commit comments

Comments
 (0)