about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNixon Enraght-Moony <nixon.emoony@gmail.com>2020-09-17 22:25:33 +0100
committerNixon Enraght-Moony <nixon.emoony@gmail.com>2020-09-18 00:02:48 +0100
commit735776d115e7e842a0c52f70a181ac9211003d55 (patch)
tree8a7816f06bac004567d8b2c06ccbcd77812f82b2
parent3c7593e69ffaf3362a598f1c359829387365bd98 (diff)
downloadrust-735776d115e7e842a0c52f70a181ac9211003d55.tar.gz
rust-735776d115e7e842a0c52f70a181ac9211003d55.zip
Fix --bless for mir-opt 32/64 bit file
-rw-r--r--src/tools/compiletest/src/runtest.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 7fcbfe9bd0d..acad316d807 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3156,12 +3156,12 @@ impl<'test> TestCx<'test> {
 
         if self.config.bless {
             for e in
-                glob(&format!("{}/{}.*.mir{}", test_dir.display(), test_crate, bit_width)).unwrap()
+                glob(&format!("{}/{}.*{}.mir", test_dir.display(), test_crate, bit_width)).unwrap()
             {
                 std::fs::remove_file(e.unwrap()).unwrap();
             }
             for e in
-                glob(&format!("{}/{}.*.diff{}", test_dir.display(), test_crate, bit_width)).unwrap()
+                glob(&format!("{}/{}.*{}.diff", test_dir.display(), test_crate, bit_width)).unwrap()
             {
                 std::fs::remove_file(e.unwrap()).unwrap();
             }
@@ -3199,7 +3199,8 @@ impl<'test> TestCx<'test> {
                     from_file = format!("{}.{}.mir", test_name, first_pass);
                     to_file = Some(second_file);
                 } else {
-                    expected_file = format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width);
+                    expected_file =
+                        format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width);
                     from_file = test_name.to_string();
                     assert!(
                         test_names.next().is_none(),