Skip to content

Commit 5a9dbb6

Browse files
committed
Disable exception handling related tests on Windows
1 parent 14b01fa commit 5a9dbb6

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ build_script:
3333
- echo "%JL_BUILD_SCRIPT%"
3434
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3535

36-
# test_script:
37-
# - echo "%JL_TEST_SCRIPT%"
38-
# - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
36+
test_script:
37+
- echo "%JL_TEST_SCRIPT%"
38+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
3939

4040
# # Uncomment to support code coverage upload. Should only be enabled for packages
4141
# # which would have coverage gaps without running on Windows

deps/build_libcxxffi.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bin_prefix = "https://github.com/JuliaInterop/Cxx.jl/releases/download/libcxxffi
1414
download_info = Dict(
1515
Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-linux-gnu-gcc7.tar.gz", "cc53946f4867d95f543ad112db6a5ce40bbdf9f5b9a8982906a14c1cff5aaced"),
1616
MacOS(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-apple-darwin14-gcc7.tar.gz", "76aa1dfc7ecb97069043ed6e19b685371e04daf92d73201aaf054678e2a11cf1"),
17-
Windows(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-w64-mingw32-gcc7.tar.gz", "9730c0c438e3cfcfc793d05e511b428e01aebf75085bd36582c822e220532790"),
17+
Windows(:x86_64) => ("https://github.com/Gnimuc/CxxBuilder/releases/download/v0.0.5-3/libcxxffi.v0.0.0.x86_64-w64-mingw32-gcc7.tar.gz", "de0dc5990e34a6a77984996936a15c4e2e8d57adaa61b7c74847b263cc52d38a"),
1818
FreeBSD(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "930df7bf7ecded6936dd9f637787b7eade402c07c0c2b2b49c4e72329d6bd9ef"),
1919
)
2020

test/misc.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ cxx""" enum myCoolEnum { OneValue = 1 }; """
180180
@assert icxx" OneValue; " == 1
181181

182182
# Exception handling
183+
@static if !Sys.iswindows()
183184
try
184185
icxx" throw 20; "
185186
@assert false
@@ -211,7 +212,7 @@ catch e
211212
showerror(buf,e)
212213
@assert String(take!(buf)) == "5"
213214
end
214-
215+
end # Sys.iswindows
215216

216217
# Memory management
217218
cxx"""

test/std.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ end
239239
end
240240
end
241241
end
242-
242+
@static if !Sys.iswindows()
243243
@testset "Exceptions" begin
244244
@testset "std::length_error&" begin
245245
v = icxx"std::vector<$Int>{1, 2, 3};"
@@ -252,3 +252,4 @@ end
252252
end
253253
end
254254
end
255+
end

0 commit comments

Comments
 (0)