get test suite to run on windows

jyn514 · Dec 29, 2019 · c57fcd0 · c57fcd0
1 parent 49716ff
commit c57fcd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mycpp b/mycpp
@@ -3,5 +3,5 @@ cpp -D __DBL_MAX__=1.797693134862315708e+308L \
 	-D __DBL_MIN__=2.225073858507201383e-308L \
 	-D __FLT_MAX__=3.402823466385288598e+38F \
 	-D __FLT_MIN__=1.175494350822287507e-38F \
-	-D __x86_64__ -D __linux__ \
+	-D __x86_64__ -D __INTPTR_TYPE__=8 -D __linux__ \
 	-P -undef "$@"
diff --git a/tests/utils/mod.rs b/tests/utils/mod.rs
@@ -24,6 +24,8 @@ pub fn cpp() -> std::process::Command {
         "-D__DBL_MIN__=2.225073858507201383e-308L",
         "-D__FLT_MAX__=3.402823466385288598e+38F",
         "-D__FLT_MIN__=1.175494350822287507e-38F",
+	"-D__INTPTR_TYPE__=8",
+	"-D__INT32_TYPE__=4",
         #[cfg(linux)]
         "-D__linux__",
         #[cfg(target_arch = "x86_64")]
@@ -115,7 +117,7 @@ pub fn assert_crash(program: &str) {
     {
         use log::warn;
         warn!("testing for segfaults is not supported on non-unix platforms, this just checks the return code is non-zero");
-        assert!(!handle.status().success());
+        assert!(!handle.wait().unwrap().success());
     }
 }