From 347c6b76a001a73c994b0abd5f1f7205cd922ac2 Mon Sep 17 00:00:00 2001
From: Charlie Andrews <charlie@cloudflare.com>
Date: Fri, 31 Aug 2018 14:42:01 -0500
Subject: [PATCH 1/3] Make json test output formatter represent "test_count" as
 num

---
 src/libtest/formatters/json.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtest/formatters/json.rs b/src/libtest/formatters/json.rs
index f7e0788a884c3..fc5ce5fc29194 100644
--- a/src/libtest/formatters/json.rs
+++ b/src/libtest/formatters/json.rs
@@ -50,7 +50,7 @@ impl<T: Write> JsonFormatter<T> {
 impl<T: Write> OutputFormatter for JsonFormatter<T> {
     fn write_run_start(&mut self, test_count: usize) -> io::Result<()> {
         self.write_message(&*format!(
-            r#"{{ "type": "suite", "event": "started", "test_count": "{}" }}"#,
+            r#"{{ "type": "suite", "event": "started", "test_count": {} }}"#,
             test_count
         ))
     }

From b9de64a0e68748899d6eb1902d0ac312faf20d71 Mon Sep 17 00:00:00 2001
From: Charlie Andrews <charlie@cloudflare.com>
Date: Fri, 31 Aug 2018 14:57:19 -0500
Subject: [PATCH 2/3] Make json test output formatter represent "filtered_out"
 as num

---
 src/libtest/formatters/json.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtest/formatters/json.rs b/src/libtest/formatters/json.rs
index fc5ce5fc29194..3c803ad82337f 100644
--- a/src/libtest/formatters/json.rs
+++ b/src/libtest/formatters/json.rs
@@ -136,7 +136,7 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
              \"allowed_fail\": {}, \
              \"ignored\": {}, \
              \"measured\": {}, \
-             \"filtered_out\": \"{}\" }}",
+             \"filtered_out\": {} }}",
             if state.failed == 0 { "ok" } else { "failed" },
             state.passed,
             state.failed + state.allowed_fail,

From 1c3dc9aca2ad06623af7667701c52b8ff3677edc Mon Sep 17 00:00:00 2001
From: Charlie Andrews <charlie@cloudflare.com>
Date: Fri, 31 Aug 2018 16:30:05 -0500
Subject: [PATCH 3/3] Fix tests for json formatting

---
 src/test/run-make-fulldeps/libtest-json/output.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/run-make-fulldeps/libtest-json/output.json b/src/test/run-make-fulldeps/libtest-json/output.json
index 235f8cd7c7257..d8169ece89b38 100644
--- a/src/test/run-make-fulldeps/libtest-json/output.json
+++ b/src/test/run-make-fulldeps/libtest-json/output.json
@@ -1,4 +1,4 @@
-{ "type": "suite", "event": "started", "test_count": "4" }
+{ "type": "suite", "event": "started", "test_count": 4 }
 { "type": "test", "event": "started", "name": "a" }
 { "type": "test", "name": "a", "event": "ok" }
 { "type": "test", "event": "started", "name": "b" }
@@ -7,4 +7,4 @@
 { "type": "test", "name": "c", "event": "ok" }
 { "type": "test", "event": "started", "name": "d" }
 { "type": "test", "name": "d", "event": "ignored" }
-{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "allowed_fail": 0, "ignored": 1, "measured": 0, "filtered_out": "0" }
+{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "allowed_fail": 0, "ignored": 1, "measured": 0, "filtered_out": 0 }