From 7d511cca5c3ba900b1997b5fa635140aaff8cdc2 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 1 Aug 2019 02:52:30 +0300
Subject: [PATCH] libpanic_unwind: Unconfigure tests during normal build

---
 src/libpanic_unwind/dwarf/mod.rs   | 21 +++------------------
 src/libpanic_unwind/dwarf/tests.rs | 19 +++++++++++++++++++
 src/tools/tidy/src/unit_tests.rs   |  1 -
 3 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 src/libpanic_unwind/dwarf/tests.rs

diff --git a/src/libpanic_unwind/dwarf/mod.rs b/src/libpanic_unwind/dwarf/mod.rs
index 0360696426dc..34128e60d363 100644
--- a/src/libpanic_unwind/dwarf/mod.rs
+++ b/src/libpanic_unwind/dwarf/mod.rs
@@ -6,6 +6,9 @@
 // are compiling it everywhere to avoid regressions.
 #![allow(unused)]
 
+#[cfg(test)]
+mod tests;
+
 pub mod eh;
 
 use core::mem;
@@ -68,21 +71,3 @@ impl DwarfReader {
         result as i64
     }
 }
-
-#[test]
-fn dwarf_reader() {
-    let encoded: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 0xE5, 0x8E, 0x26, 0x9B, 0xF1, 0x59, 0xFF, 0xFF];
-
-    let mut reader = DwarfReader::new(encoded.as_ptr());
-
-    unsafe {
-        assert!(reader.read::<u8>() == u8::to_be(1u8));
-        assert!(reader.read::<u16>() == u16::to_be(0x0203));
-        assert!(reader.read::<u32>() == u32::to_be(0x04050607));
-
-        assert!(reader.read_uleb128() == 624485);
-        assert!(reader.read_sleb128() == -624485);
-
-        assert!(reader.read::<i8>() == i8::to_be(-1));
-    }
-}
diff --git a/src/libpanic_unwind/dwarf/tests.rs b/src/libpanic_unwind/dwarf/tests.rs
new file mode 100644
index 000000000000..1644f37083a5
--- /dev/null
+++ b/src/libpanic_unwind/dwarf/tests.rs
@@ -0,0 +1,19 @@
+use super::*;
+
+#[test]
+fn dwarf_reader() {
+    let encoded: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 0xE5, 0x8E, 0x26, 0x9B, 0xF1, 0x59, 0xFF, 0xFF];
+
+    let mut reader = DwarfReader::new(encoded.as_ptr());
+
+    unsafe {
+        assert!(reader.read::<u8>() == u8::to_be(1u8));
+        assert!(reader.read::<u16>() == u16::to_be(0x0203));
+        assert!(reader.read::<u32>() == u32::to_be(0x04050607));
+
+        assert!(reader.read_uleb128() == 624485);
+        assert!(reader.read_sleb128() == -624485);
+
+        assert!(reader.read::<i8>() == i8::to_be(-1));
+    }
+}
diff --git a/src/tools/tidy/src/unit_tests.rs b/src/tools/tidy/src/unit_tests.rs
index 14d5f08c16b3..ff82e749fa45 100644
--- a/src/tools/tidy/src/unit_tests.rs
+++ b/src/tools/tidy/src/unit_tests.rs
@@ -27,7 +27,6 @@ pub fn check(root_path: &Path, bad: &mut bool) {
     };
     let fixme = [
         "liballoc",
-        "libpanic_unwind/dwarf",
         "librustc",
         "librustc_data_structures",
         "librustc_incremental/persist",