0cdde6e5e0
This commits adds an associated type to the `FromStr` trait representing an error payload for parses which do not succeed. The previous return value, `Option<Self>` did not allow for this form of payload. After the associated type was added, the following attributes were applied: * `FromStr` is now stable * `FromStr::Err` is now stable * `FromStr::from_str` is now stable * `StrExt::parse` is now stable * `FromStr for bool` is now stable * `FromStr for $float` is now stable * `FromStr for $integral` is now stable * Errors returned from stable `FromStr` implementations are stable * Errors implement `Display` and `Error` (both impl blocks being `#[stable]`) Closes #15138
150 lines
4.0 KiB
Rust
150 lines
4.0 KiB
Rust
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
pub use self::Mode::*;
|
|
|
|
use std::fmt;
|
|
use std::str::FromStr;
|
|
|
|
#[derive(Clone, Copy, PartialEq, Debug)]
|
|
pub enum Mode {
|
|
CompileFail,
|
|
RunFail,
|
|
RunPass,
|
|
RunPassValgrind,
|
|
Pretty,
|
|
DebugInfoGdb,
|
|
DebugInfoLldb,
|
|
Codegen
|
|
}
|
|
|
|
impl FromStr for Mode {
|
|
type Err = ();
|
|
fn from_str(s: &str) -> Result<Mode, ()> {
|
|
match s {
|
|
"compile-fail" => Ok(CompileFail),
|
|
"run-fail" => Ok(RunFail),
|
|
"run-pass" => Ok(RunPass),
|
|
"run-pass-valgrind" => Ok(RunPassValgrind),
|
|
"pretty" => Ok(Pretty),
|
|
"debuginfo-lldb" => Ok(DebugInfoLldb),
|
|
"debuginfo-gdb" => Ok(DebugInfoGdb),
|
|
"codegen" => Ok(Codegen),
|
|
_ => Err(()),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for Mode {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
fmt::Display::fmt(match *self {
|
|
CompileFail => "compile-fail",
|
|
RunFail => "run-fail",
|
|
RunPass => "run-pass",
|
|
RunPassValgrind => "run-pass-valgrind",
|
|
Pretty => "pretty",
|
|
DebugInfoGdb => "debuginfo-gdb",
|
|
DebugInfoLldb => "debuginfo-lldb",
|
|
Codegen => "codegen",
|
|
}, f)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct Config {
|
|
// The library paths required for running the compiler
|
|
pub compile_lib_path: String,
|
|
|
|
// The library paths required for running compiled programs
|
|
pub run_lib_path: String,
|
|
|
|
// The rustc executable
|
|
pub rustc_path: Path,
|
|
|
|
// The clang executable
|
|
pub clang_path: Option<Path>,
|
|
|
|
// The llvm binaries path
|
|
pub llvm_bin_path: Option<Path>,
|
|
|
|
// The valgrind path
|
|
pub valgrind_path: Option<String>,
|
|
|
|
// Whether to fail if we can't run run-pass-valgrind tests under valgrind
|
|
// (or, alternatively, to silently run them like regular run-pass tests).
|
|
pub force_valgrind: bool,
|
|
|
|
// The directory containing the tests to run
|
|
pub src_base: Path,
|
|
|
|
// The directory where programs should be built
|
|
pub build_base: Path,
|
|
|
|
// Directory for auxiliary libraries
|
|
pub aux_base: Path,
|
|
|
|
// The name of the stage being built (stage1, etc)
|
|
pub stage_id: String,
|
|
|
|
// The test mode, compile-fail, run-fail, run-pass
|
|
pub mode: Mode,
|
|
|
|
// Run ignored tests
|
|
pub run_ignored: bool,
|
|
|
|
// Only run tests that match this filter
|
|
pub filter: Option<String>,
|
|
|
|
// Write out a parseable log of tests that were run
|
|
pub logfile: Option<Path>,
|
|
|
|
// A command line to prefix program execution with,
|
|
// for running under valgrind
|
|
pub runtool: Option<String>,
|
|
|
|
// Flags to pass to the compiler when building for the host
|
|
pub host_rustcflags: Option<String>,
|
|
|
|
// Flags to pass to the compiler when building for the target
|
|
pub target_rustcflags: Option<String>,
|
|
|
|
// Run tests using the JIT
|
|
pub jit: bool,
|
|
|
|
// Target system to be tested
|
|
pub target: String,
|
|
|
|
// Host triple for the compiler being invoked
|
|
pub host: String,
|
|
|
|
// Version of GDB
|
|
pub gdb_version: Option<String>,
|
|
|
|
// Version of LLDB
|
|
pub lldb_version: Option<String>,
|
|
|
|
// Path to the android tools
|
|
pub android_cross_path: Path,
|
|
|
|
// Extra parameter to run adb on arm-linux-androideabi
|
|
pub adb_path: String,
|
|
|
|
// Extra parameter to run test suite on arm-linux-androideabi
|
|
pub adb_test_dir: String,
|
|
|
|
// status whether android device available or not
|
|
pub adb_device_status: bool,
|
|
|
|
// the path containing LLDB's Python module
|
|
pub lldb_python_dir: Option<String>,
|
|
|
|
// Explain what's going on
|
|
pub verbose: bool
|
|
}
|