From 1ca7bfe481a18909e4769a9f6aee58f8cec17b44 Mon Sep 17 00:00:00 2001
From: Andrew Paverd <andrew.paverd@microsoft.com>
Date: Mon, 6 Jul 2020 16:10:42 +0100
Subject: Only add cfguard module flag on windows-msvc

---
 src/test/codegen/cfguard-checks.rs   | 11 +++++++++++
 src/test/codegen/cfguard-disabled.rs | 11 +++++++++++
 src/test/codegen/cfguard-nochecks.rs | 11 +++++++++++
 src/test/codegen/cfguard-non-msvc.rs | 11 +++++++++++
 src/test/codegen/cfguard_checks.rs   | 10 ----------
 src/test/codegen/cfguard_disabled.rs | 10 ----------
 src/test/codegen/cfguard_nochecks.rs | 10 ----------
 7 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 src/test/codegen/cfguard-checks.rs
 create mode 100644 src/test/codegen/cfguard-disabled.rs
 create mode 100644 src/test/codegen/cfguard-nochecks.rs
 create mode 100644 src/test/codegen/cfguard-non-msvc.rs
 delete mode 100644 src/test/codegen/cfguard_checks.rs
 delete mode 100644 src/test/codegen/cfguard_disabled.rs
 delete mode 100644 src/test/codegen/cfguard_nochecks.rs

(limited to 'src/test/codegen')

diff --git a/src/test/codegen/cfguard-checks.rs b/src/test/codegen/cfguard-checks.rs
new file mode 100644
index 00000000000..96a0a321199
--- /dev/null
+++ b/src/test/codegen/cfguard-checks.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z control-flow-guard=checks
+// only-msvc
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard=2 is present
+// CHECK: !"cfguard", i32 2
diff --git a/src/test/codegen/cfguard-disabled.rs b/src/test/codegen/cfguard-disabled.rs
new file mode 100644
index 00000000000..925e4e8e2d1
--- /dev/null
+++ b/src/test/codegen/cfguard-disabled.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z control-flow-guard=no
+// only-msvc
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard is not present
+// CHECK-NOT: !"cfguard"
diff --git a/src/test/codegen/cfguard-nochecks.rs b/src/test/codegen/cfguard-nochecks.rs
new file mode 100644
index 00000000000..d7dc3d7e89e
--- /dev/null
+++ b/src/test/codegen/cfguard-nochecks.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z control-flow-guard=nochecks
+// only-msvc
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard=1 is present
+// CHECK: !"cfguard", i32 1
diff --git a/src/test/codegen/cfguard-non-msvc.rs b/src/test/codegen/cfguard-non-msvc.rs
new file mode 100644
index 00000000000..4008f0187a0
--- /dev/null
+++ b/src/test/codegen/cfguard-non-msvc.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z control-flow-guard
+// ignore-msvc
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the cfguard module flag is not added for non-MSVC targets.
+// CHECK-NOT: !"cfguard"
diff --git a/src/test/codegen/cfguard_checks.rs b/src/test/codegen/cfguard_checks.rs
deleted file mode 100644
index 96f9158f9d3..00000000000
--- a/src/test/codegen/cfguard_checks.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-flags: -Z control-flow-guard=checks
-
-#![crate_type = "lib"]
-
-// A basic test function.
-pub fn test() {
-}
-
-// Ensure the module flag cfguard=2 is present
-// CHECK: !"cfguard", i32 2
diff --git a/src/test/codegen/cfguard_disabled.rs b/src/test/codegen/cfguard_disabled.rs
deleted file mode 100644
index 1325ffc0f25..00000000000
--- a/src/test/codegen/cfguard_disabled.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-flags: -Z control-flow-guard=no
-
-#![crate_type = "lib"]
-
-// A basic test function.
-pub fn test() {
-}
-
-// Ensure the module flag cfguard is not present
-// CHECK-NOT: !"cfguard"
diff --git a/src/test/codegen/cfguard_nochecks.rs b/src/test/codegen/cfguard_nochecks.rs
deleted file mode 100644
index ae1de4c4d26..00000000000
--- a/src/test/codegen/cfguard_nochecks.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-flags: -Z control-flow-guard=nochecks
-
-#![crate_type = "lib"]
-
-// A basic test function.
-pub fn test() {
-}
-
-// Ensure the module flag cfguard=1 is present
-// CHECK: !"cfguard", i32 1
-- 
cgit 1.4.1-3-g733a5