Disable exception handling related tests on Windows

JuliaInterop · Jul 6, 2019 · 5a9dbb6 · 5a9dbb6
1 parent 14b01fa
commit 5a9dbb6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -33,9 +33,9 @@ build_script:
   - echo "%JL_BUILD_SCRIPT%"
   - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
-# test_script:
-#   - echo "%JL_TEST_SCRIPT%"
-#   - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+test_script:
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
 
 # # Uncomment to support code coverage upload. Should only be enabled for packages
 # # which would have coverage gaps without running on Windows

diff --git a/deps/build_libcxxffi.jl b/deps/build_libcxxffi.jl
@@ -14,7 +14,7 @@ bin_prefix = "https://github.com/JuliaInterop/Cxx.jl/releases/download/libcxxffi
 download_info = Dict(
     Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-linux-gnu-gcc7.tar.gz", "cc53946f4867d95f543ad112db6a5ce40bbdf9f5b9a8982906a14c1cff5aaced"),
     MacOS(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-apple-darwin14-gcc7.tar.gz", "76aa1dfc7ecb97069043ed6e19b685371e04daf92d73201aaf054678e2a11cf1"),
-    Windows(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-w64-mingw32-gcc7.tar.gz", "9730c0c438e3cfcfc793d05e511b428e01aebf75085bd36582c822e220532790"),
+    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"),
     FreeBSD(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "930df7bf7ecded6936dd9f637787b7eade402c07c0c2b2b49c4e72329d6bd9ef"),
 )
 

diff --git a/test/misc.jl b/test/misc.jl
@@ -180,6 +180,7 @@ cxx""" enum myCoolEnum { OneValue = 1 }; """
 @assert icxx" OneValue; " == 1
 
 # Exception handling
+@static if !Sys.iswindows()
 try
     icxx" throw 20; "
     @assert false
@@ -211,7 +212,7 @@ catch e
     showerror(buf,e)
     @assert String(take!(buf)) == "5"
 end
-
+end # Sys.iswindows
 
 # Memory management
 cxx"""

diff --git a/test/std.jl b/test/std.jl
@@ -239,7 +239,7 @@ end
         end
     end
 end
-
+@static if !Sys.iswindows()
 @testset "Exceptions" begin
     @testset "std::length_error&" begin
         v = icxx"std::vector<$Int>{1, 2, 3};"
@@ -252,3 +252,4 @@ end
         end
     end
 end
+end