Merge pull request #909 from PyO3/fix-grcov

Use -Cpanic=abort for correct coverage

.travis.yml

@@ -47,9 +47,6 @@ install:
   - pip install setuptools-rust pytest pytest-benchmark tox
 
 script:
-  - if ! [[ $FEATURES == *"pypy"* ]]; then export CARGO_INCREMENTAL=0; fi
-  # Options for grcov
-  - if ! [[ $FEATURES == *"pypy"* ]]; then export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off"; fi
   - ./ci/travis/test.sh
 
 deploy:

ci/travis/cover.sh

@@ -9,6 +9,11 @@ if [[ $FEATURES == *"pypy"* ]]; then
 fi
 
 ### Run grcov ##################################################################
+# export env vars and re-run tests
+export CARGO_INCREMENTAL=0
+export RUSTFLAGS="-Zpanic_abort_tests -Zprofile -Cpanic=abort -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off"
+export RUSTDOCFLAGS="-Cpanic=abort"
+cargo test --features "$FEATURES num-bigint num-complex"
 
 zip -0 ccov.zip `find . \( -name "pyo3*.gc*" \) -print`;
 ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info;

src/err.rs

@@ -600,6 +600,14 @@ mod tests {
 
     #[test]
     fn fetching_panic_exception_panics() {
+        // If -Cpanic=abort is specified, we can't catch panic.
+        if option_env!("RUSTFLAGS")
+            .map(|s| s.contains("-Cpanic=abort"))
+            .unwrap_or(false)
+        {
+            return;
+        }
+
         let gil = Python::acquire_gil();
         let py = gil.python();
         let err: PyErr = PanicException::py_err("new panic");