Skip to content

Commit bcd510c

Browse files
authored
Merge pull request #19 from giordano/windows-tests
Run Travis on 32-bit systems and Windows and fix Windows errors
2 parents abc06f9 + bed48c4 commit bcd510c

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ language: julia
33
os:
44
- linux
55
- osx
6+
- windows
7+
arch:
8+
- x64
9+
- x86
10+
matrix:
11+
allow_failures:
12+
- julia: nightly
13+
- arch: x86
614
julia:
715
- 1.0
816
- 1.3

src/Abstract/DynamicLink.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ function canonical_rpaths(rpath::RPath)
134134
paths[idx] = replace(paths[idx], "@executable_path" => origin)
135135
paths[idx] = abspath(paths[idx])
136136

137-
# Make sure that if it's a directory, it _always_ has a "/" at the end.
138-
if isdir(paths[idx]) && paths[idx][end] != '/'
139-
paths[idx] = paths[idx] * "/"
137+
# Make sure that if it's a directory, it _always_ has a trailing path separator.
138+
if isdir(paths[idx]) && paths[idx][end] != Base.Filesystem.path_separator
139+
paths[idx] = paths[idx] * Base.Filesystem.path_separator
140140
end
141141
end
142142
return paths

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function test_libfoo_and_fooifier(fooifier_path, libfoo_path)
4646
# Ensure that `dir_path` is one of the RPath entries
4747
rpath = RPath(oh_exe)
4848
can_paths = canonical_rpaths(rpath)
49-
@test abspath(dir_path * "/") in can_paths
49+
@test abspath(dir_path * Base.Filesystem.path_separator) in can_paths
5050

5151
# Ensure that `fooifier` is going to try to load `libfoo`:
5252
foo_libs = find_libraries(oh_exe)

0 commit comments

Comments
 (0)