From 0340ddbb65949786b7c13c465abcc20bb90b9e5f Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Fri, 11 Oct 2019 17:00:43 +0200
Subject: [PATCH] [bugpoint] Move test content to the tests/ directory;

---
 cranelift/src/bugpoint.rs                   | 86 +--------------------
 cranelift/{src => tests}/bugpoint_test.clif |  0
 cranelift/tests/bugpoint_test_expected.clif | 76 ++++++++++++++++++
 3 files changed, 79 insertions(+), 83 deletions(-)
 rename cranelift/{src => tests}/bugpoint_test.clif (100%)
 create mode 100644 cranelift/tests/bugpoint_test_expected.clif

diff --git a/cranelift/src/bugpoint.rs b/cranelift/src/bugpoint.rs
index 4091f1b9a0..c2a845e1b8 100644
--- a/cranelift/src/bugpoint.rs
+++ b/cranelift/src/bugpoint.rs
@@ -742,7 +742,8 @@ mod tests {
 
     #[test]
     fn test_reduce() {
-        const TEST: &'static str = include_str!("./bugpoint_test.clif");
+        const TEST: &'static str = include_str!("../tests/bugpoint_test.clif");
+        const EXPECTED: &'static str = include_str!("../tests/bugpoint_test_expected.clif");
 
         let test_file = parse_test(TEST, ParseOptions::default()).unwrap();
 
@@ -752,89 +753,8 @@ mod tests {
 
         for (func, _) in test_file.functions {
             let (func, crash_msg) = reduce(isa, func, false).expect("Couldn't reduce test case");
-
             assert_eq!(crash_msg, "test crash");
-
-            assert_eq!(
-                format!("{}", func),
-                "function u0:0(i64, i64, i64) system_v {
-    sig0 = (i64, i64, i16, i64, i64, i64, i64, i64) system_v
-    fn0 = u0:95 sig0
-
-ebb0(v0: i64, v1: i64, v2: i64):
-    v113 -> v1
-    v124 -> v1
-    v136 -> v1
-    v148 -> v1
-    v160 -> v1
-    v185 -> v1
-    v222 -> v1
-    v237 -> v1
-    v241 -> v1
-    v256 -> v1
-    v262 -> v1
-    v105 = iconst.i64 0
-    trap user0
-
-ebb99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v1057: i64):
-    v817 -> v1035
-    v830 -> v1037
-    v844 -> v1039
-    v857 -> v1039
-    v939 -> v1039
-    v1042 -> v1039
-    v1050 -> v1039
-    v908 -> v1044
-    v917 -> v1044
-    v921 -> v1044
-    v1043 -> v1044
-    v960 -> v1052
-    v990 -> v1052
-    v1051 -> v1052
-    v1055 -> v1052
-    v963 -> v1057
-    v1056 -> v1057
-    v1060 -> v1057
-    trap user0
-
-ebb101:
-    v829 = iconst.i64 0
-    v935 -> v829
-    v962 -> v829
-    v992 -> v829
-    v1036 -> v829
-    v1049 -> v829
-    trap user0
-
-ebb102:
-    v842 = iconst.i64 0
-    v976 -> v842
-    v989 -> v842
-    v1038 -> v842
-    v1061 -> v842
-    trap user0
-
-ebb105:
-    v883 = iconst.i64 0
-    v934 -> v883
-    v961 -> v883
-    v991 -> v883
-    v1005 -> v883
-    v1048 -> v883
-    trap user0
-
-ebb114:
-    v951 = iconst.i64 0
-    v988 -> v951
-    trap user0
-
-ebb117:
-    v987 = iconst.i64 0
-    call fn0(v0, v105, v1052, v883, v829, v987, v951, v842)
-    trap user0
-}
-"
-            );
+            assert_eq!(format!("{}", func), EXPECTED.replace("\r\n", "\n"));
         }
     }
 }
diff --git a/cranelift/src/bugpoint_test.clif b/cranelift/tests/bugpoint_test.clif
similarity index 100%
rename from cranelift/src/bugpoint_test.clif
rename to cranelift/tests/bugpoint_test.clif
diff --git a/cranelift/tests/bugpoint_test_expected.clif b/cranelift/tests/bugpoint_test_expected.clif
new file mode 100644
index 0000000000..0382b856f1
--- /dev/null
+++ b/cranelift/tests/bugpoint_test_expected.clif
@@ -0,0 +1,76 @@
+function u0:0(i64, i64, i64) system_v {
+    sig0 = (i64, i64, i16, i64, i64, i64, i64, i64) system_v
+    fn0 = u0:95 sig0
+
+ebb0(v0: i64, v1: i64, v2: i64):
+    v113 -> v1
+    v124 -> v1
+    v136 -> v1
+    v148 -> v1
+    v160 -> v1
+    v185 -> v1
+    v222 -> v1
+    v237 -> v1
+    v241 -> v1
+    v256 -> v1
+    v262 -> v1
+    v105 = iconst.i64 0
+    trap user0
+
+ebb99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v1057: i64):
+    v817 -> v1035
+    v830 -> v1037
+    v844 -> v1039
+    v857 -> v1039
+    v939 -> v1039
+    v1042 -> v1039
+    v1050 -> v1039
+    v908 -> v1044
+    v917 -> v1044
+    v921 -> v1044
+    v1043 -> v1044
+    v960 -> v1052
+    v990 -> v1052
+    v1051 -> v1052
+    v1055 -> v1052
+    v963 -> v1057
+    v1056 -> v1057
+    v1060 -> v1057
+    trap user0
+
+ebb101:
+    v829 = iconst.i64 0
+    v935 -> v829
+    v962 -> v829
+    v992 -> v829
+    v1036 -> v829
+    v1049 -> v829
+    trap user0
+
+ebb102:
+    v842 = iconst.i64 0
+    v976 -> v842
+    v989 -> v842
+    v1038 -> v842
+    v1061 -> v842
+    trap user0
+
+ebb105:
+    v883 = iconst.i64 0
+    v934 -> v883
+    v961 -> v883
+    v991 -> v883
+    v1005 -> v883
+    v1048 -> v883
+    trap user0
+
+ebb114:
+    v951 = iconst.i64 0
+    v988 -> v951
+    trap user0
+
+ebb117:
+    v987 = iconst.i64 0
+    call fn0(v0, v105, v1052, v883, v829, v987, v951, v842)
+    trap user0
+}