From 9b02dd41e4afcf163a65fab7940b53e45736b9bc Mon Sep 17 00:00:00 2001
From: Chris Field <chris@fieldrndservices.com>
Date: Sun, 21 Feb 2021 21:45:55 -0500
Subject: [PATCH] Fix tests for CI environment

The `panic="unwind"` appears in the output for the CI tests, but not in
my local tests. I need to investigate the origin of this configuration
but it causes the CI builds to fail.
---
 tests/testsuite/rustc.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs
index 3a43bc92c..ced401830 100644
--- a/tests/testsuite/rustc.rs
+++ b/tests/testsuite/rustc.rs
@@ -471,6 +471,7 @@ fn rustc_with_print_cfg_single_target() {
         .with_stdout_contains(
             "\
 debug_assertions
+panic=\"unwind\"
 target_arch=\"x86_64\"
 target_endian=\"little\"
 target_env=\"msvc\"
@@ -543,6 +544,7 @@ target_vendor=\"unknown\"
 unix
 
 debug_assertions
+panic=\"unwind\"
 target_arch=\"x86_64\"
 target_endian=\"little\"
 target_env=\"msvc\"
@@ -587,6 +589,7 @@ fn rustc_with_print_cfg_rustflags_env_var() {
         .with_stdout_contains(
             "\
 debug_assertions
+panic=\"unwind\"
 target_arch=\"x86_64\"
 target_endian=\"little\"
 target_env=\"msvc\"
@@ -640,6 +643,7 @@ rustflags = ["-C", "target-feature=+crt-static"]
         .with_stdout_contains(
             "\
 debug_assertions
+panic=\"unwind\"
 target_arch=\"x86_64\"
 target_endian=\"little\"
 target_env=\"msvc\"