From f53fc21ba0e99c6e7c715db7c2c618a7954620f3 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 1 Aug 2019 02:47:06 +0300
Subject: [PATCH] libserialize: Unconfigure tests during normal build

---
 src/libserialize/leb128.rs       | 44 ------------------------------
 src/libserialize/tests/leb128.rs | 46 ++++++++++++++++++++++++++++++++
 src/tools/tidy/src/unit_tests.rs |  1 -
 3 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 src/libserialize/tests/leb128.rs

diff --git a/src/libserialize/leb128.rs b/src/libserialize/leb128.rs
index f9d80842d755..88ce6d81d757 100644
--- a/src/libserialize/leb128.rs
+++ b/src/libserialize/leb128.rs
@@ -138,47 +138,3 @@ pub fn read_signed_leb128(data: &[u8], start_position: usize) -> (i128, usize) {
 
     (result, position - start_position)
 }
-
-macro_rules! impl_test_unsigned_leb128 {
-    ($test_name:ident, $write_fn_name:ident, $read_fn_name:ident, $int_ty:ident) => (
-        #[test]
-        fn $test_name() {
-            let mut stream = Vec::new();
-
-            for x in 0..62 {
-                $write_fn_name(&mut stream, (3u64 << x) as $int_ty);
-            }
-
-            let mut position = 0;
-            for x in 0..62 {
-                let expected = (3u64 << x) as $int_ty;
-                let (actual, bytes_read) = $read_fn_name(&stream[position ..]);
-                assert_eq!(expected, actual);
-                position += bytes_read;
-            }
-            assert_eq!(stream.len(), position);
-        }
-    )
-}
-
-impl_test_unsigned_leb128!(test_u16_leb128, write_u16_leb128, read_u16_leb128, u16);
-impl_test_unsigned_leb128!(test_u32_leb128, write_u32_leb128, read_u32_leb128, u32);
-impl_test_unsigned_leb128!(test_u64_leb128, write_u64_leb128, read_u64_leb128, u64);
-impl_test_unsigned_leb128!(test_u128_leb128, write_u128_leb128, read_u128_leb128, u128);
-impl_test_unsigned_leb128!(test_usize_leb128, write_usize_leb128, read_usize_leb128, usize);
-
-#[test]
-fn test_signed_leb128() {
-    let values: Vec<_> = (-500..500).map(|i| i * 0x12345789ABCDEF).collect();
-    let mut stream = Vec::new();
-    for &x in &values {
-        write_signed_leb128(&mut stream, x);
-    }
-    let mut pos = 0;
-    for &x in &values {
-        let (value, bytes_read) = read_signed_leb128(&mut stream, pos);
-        pos += bytes_read;
-        assert_eq!(x, value);
-    }
-    assert_eq!(pos, stream.len());
-}
diff --git a/src/libserialize/tests/leb128.rs b/src/libserialize/tests/leb128.rs
new file mode 100644
index 000000000000..4eb4397fecc3
--- /dev/null
+++ b/src/libserialize/tests/leb128.rs
@@ -0,0 +1,46 @@
+extern crate serialize as rustc_serialize;
+use rustc_serialize::leb128::*;
+
+macro_rules! impl_test_unsigned_leb128 {
+    ($test_name:ident, $write_fn_name:ident, $read_fn_name:ident, $int_ty:ident) => (
+        #[test]
+        fn $test_name() {
+            let mut stream = Vec::new();
+
+            for x in 0..62 {
+                $write_fn_name(&mut stream, (3u64 << x) as $int_ty);
+            }
+
+            let mut position = 0;
+            for x in 0..62 {
+                let expected = (3u64 << x) as $int_ty;
+                let (actual, bytes_read) = $read_fn_name(&stream[position ..]);
+                assert_eq!(expected, actual);
+                position += bytes_read;
+            }
+            assert_eq!(stream.len(), position);
+        }
+    )
+}
+
+impl_test_unsigned_leb128!(test_u16_leb128, write_u16_leb128, read_u16_leb128, u16);
+impl_test_unsigned_leb128!(test_u32_leb128, write_u32_leb128, read_u32_leb128, u32);
+impl_test_unsigned_leb128!(test_u64_leb128, write_u64_leb128, read_u64_leb128, u64);
+impl_test_unsigned_leb128!(test_u128_leb128, write_u128_leb128, read_u128_leb128, u128);
+impl_test_unsigned_leb128!(test_usize_leb128, write_usize_leb128, read_usize_leb128, usize);
+
+#[test]
+fn test_signed_leb128() {
+    let values: Vec<_> = (-500..500).map(|i| i * 0x12345789ABCDEF).collect();
+    let mut stream = Vec::new();
+    for &x in &values {
+        write_signed_leb128(&mut stream, x);
+    }
+    let mut pos = 0;
+    for &x in &values {
+        let (value, bytes_read) = read_signed_leb128(&mut stream, pos);
+        pos += bytes_read;
+        assert_eq!(x, value);
+    }
+    assert_eq!(pos, stream.len());
+}
diff --git a/src/tools/tidy/src/unit_tests.rs b/src/tools/tidy/src/unit_tests.rs
index 23fe06080892..14d5f08c16b3 100644
--- a/src/tools/tidy/src/unit_tests.rs
+++ b/src/tools/tidy/src/unit_tests.rs
@@ -34,7 +34,6 @@ pub fn check(root_path: &Path, bad: &mut bool) {
         "librustc_lexer/src",
         "librustc_target/spec",
         "librustdoc",
-        "libserialize",
         "libstd",
         "libsyntax",
         "libsyntax_pos",