From 22b571d62a6750d1d67509a8e71f524c69d37b9d Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Tue, 6 Nov 2018 17:07:17 +0100 Subject: [PATCH] Add explcit `--error-format` options to tests of print-fuel to sidestep compiletests presumption of JSON. As a driveby, rename the stdout files to stderr, which should have been part of the earlier commit. --- src/test/run-pass/optimization-fuel-0.rs | 3 ++- .../{optimization-fuel-0.stdout => optimization-fuel-0.stderr} | 0 src/test/run-pass/optimization-fuel-1.rs | 3 ++- .../{optimization-fuel-1.stdout => optimization-fuel-1.stderr} | 0 src/test/ui/print-fuel/print-fuel.rs | 3 ++- .../ui/print-fuel/{print-fuel.stdout => print-fuel.stderr} | 0 6 files changed, 6 insertions(+), 3 deletions(-) rename src/test/run-pass/{optimization-fuel-0.stdout => optimization-fuel-0.stderr} (100%) rename src/test/run-pass/{optimization-fuel-1.stdout => optimization-fuel-1.stderr} (100%) rename src/test/ui/print-fuel/{print-fuel.stdout => print-fuel.stderr} (100%) diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/run-pass/optimization-fuel-0.rs index 3832c040108..a12dad4489d 100644 --- a/src/test/run-pass/optimization-fuel-0.rs +++ b/src/test/run-pass/optimization-fuel-0.rs @@ -12,7 +12,8 @@ use std::mem::size_of; -// compile-flags: -Z fuel=foo=0 +// (#55495: The --error-format is to sidestep an issue in our test harness) +// compile-flags: --error-format human -Z fuel=foo=0 struct S1(u8, u16, u8); struct S2(u8, u16, u8); diff --git a/src/test/run-pass/optimization-fuel-0.stdout b/src/test/run-pass/optimization-fuel-0.stderr similarity index 100% rename from src/test/run-pass/optimization-fuel-0.stdout rename to src/test/run-pass/optimization-fuel-0.stderr diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/run-pass/optimization-fuel-1.rs index e3529ebfb0d..1e76aaa48b7 100644 --- a/src/test/run-pass/optimization-fuel-1.rs +++ b/src/test/run-pass/optimization-fuel-1.rs @@ -12,7 +12,8 @@ use std::mem::size_of; -// compile-flags: -Z fuel=foo=1 +// (#55495: The --error-format is to sidestep an issue in our test harness) +// compile-flags: --error-format human -Z fuel=foo=1 struct S1(u8, u16, u8); struct S2(u8, u16, u8); diff --git a/src/test/run-pass/optimization-fuel-1.stdout b/src/test/run-pass/optimization-fuel-1.stderr similarity index 100% rename from src/test/run-pass/optimization-fuel-1.stdout rename to src/test/run-pass/optimization-fuel-1.stderr diff --git a/src/test/ui/print-fuel/print-fuel.rs b/src/test/ui/print-fuel/print-fuel.rs index 96b025128ee..31123410481 100644 --- a/src/test/ui/print-fuel/print-fuel.rs +++ b/src/test/ui/print-fuel/print-fuel.rs @@ -11,7 +11,8 @@ #![crate_name="foo"] #![allow(dead_code)] -// compile-flags: -Z print-fuel=foo +// (#55495: The --error-format is to sidestep an issue in our test harness) +// compile-flags: --error-format human -Z print-fuel=foo // compile-pass struct S1(u8, u16, u8); diff --git a/src/test/ui/print-fuel/print-fuel.stdout b/src/test/ui/print-fuel/print-fuel.stderr similarity index 100% rename from src/test/ui/print-fuel/print-fuel.stdout rename to src/test/ui/print-fuel/print-fuel.stderr