Skip to content

Commit 9aa4a94

Browse files
committed
compiletest: Switch field privacy where necessary
1 parent d0a80cc commit 9aa4a94

File tree

4 files changed

+44
-40
lines changed

4 files changed

+44
-40
lines changed

src/compiletest/common.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,87 +21,87 @@ pub enum mode {
2121
#[deriving(Clone)]
2222
pub struct config {
2323
// The library paths required for running the compiler
24-
compile_lib_path: ~str,
24+
pub compile_lib_path: ~str,
2525

2626
// The library paths required for running compiled programs
27-
run_lib_path: ~str,
27+
pub run_lib_path: ~str,
2828

2929
// The rustc executable
30-
rustc_path: Path,
30+
pub rustc_path: Path,
3131

3232
// The clang executable
33-
clang_path: Option<Path>,
33+
pub clang_path: Option<Path>,
3434

3535
// The llvm binaries path
36-
llvm_bin_path: Option<Path>,
36+
pub llvm_bin_path: Option<Path>,
3737

3838
// The directory containing the tests to run
39-
src_base: Path,
39+
pub src_base: Path,
4040

4141
// The directory where programs should be built
42-
build_base: Path,
42+
pub build_base: Path,
4343

4444
// Directory for auxiliary libraries
45-
aux_base: Path,
45+
pub aux_base: Path,
4646

4747
// The name of the stage being built (stage1, etc)
48-
stage_id: ~str,
48+
pub stage_id: ~str,
4949

5050
// The test mode, compile-fail, run-fail, run-pass
51-
mode: mode,
51+
pub mode: mode,
5252

5353
// Run ignored tests
54-
run_ignored: bool,
54+
pub run_ignored: bool,
5555

5656
// Only run tests that match this filter
57-
filter: Option<~str>,
57+
pub filter: Option<~str>,
5858

5959
// Write out a parseable log of tests that were run
60-
logfile: Option<Path>,
60+
pub logfile: Option<Path>,
6161

6262
// Write out a json file containing any metrics of the run
63-
save_metrics: Option<Path>,
63+
pub save_metrics: Option<Path>,
6464

6565
// Write and ratchet a metrics file
66-
ratchet_metrics: Option<Path>,
66+
pub ratchet_metrics: Option<Path>,
6767

6868
// Percent change in metrics to consider noise
69-
ratchet_noise_percent: Option<f64>,
69+
pub ratchet_noise_percent: Option<f64>,
7070

71-
// "Shard" of the testsuite to run: this has the form of
71+
// "Shard" of the testsuite to pub run: this has the form of
7272
// two numbers (a,b), and causes only those tests with
7373
// positional order equal to a mod b to run.
74-
test_shard: Option<(uint,uint)>,
74+
pub test_shard: Option<(uint,uint)>,
7575

7676
// A command line to prefix program execution with,
7777
// for running under valgrind
78-
runtool: Option<~str>,
78+
pub runtool: Option<~str>,
7979

8080
// Flags to pass to the compiler when building for the host
81-
host_rustcflags: Option<~str>,
81+
pub host_rustcflags: Option<~str>,
8282

8383
// Flags to pass to the compiler when building for the target
84-
target_rustcflags: Option<~str>,
84+
pub target_rustcflags: Option<~str>,
8585

8686
// Run tests using the JIT
87-
jit: bool,
87+
pub jit: bool,
8888

8989
// Target system to be tested
90-
target: ~str,
90+
pub target: ~str,
9191

9292
// Host triple for the compiler being invoked
93-
host: ~str,
93+
pub host: ~str,
9494

9595
// Extra parameter to run adb on arm-linux-androideabi
96-
adb_path: ~str,
96+
pub adb_path: ~str,
9797

9898
// Extra parameter to run test sute on arm-linux-androideabi
99-
adb_test_dir: ~str,
99+
pub adb_test_dir: ~str,
100100

101101
// status whether android device available or not
102-
adb_device_status: bool,
102+
pub adb_device_status: bool,
103103

104104
// Explain what's going on
105-
verbose: bool
105+
pub verbose: bool
106106

107107
}

src/compiletest/errors.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
use std::io::{BufferedReader, File};
1212

13-
pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
13+
pub struct ExpectedError {
14+
pub line: uint,
15+
pub kind: ~str,
16+
pub msg: ~str,
17+
}
1418

1519
// Load any test directives embedded in the file
1620
pub fn load_errors(testfile: &Path) -> Vec<ExpectedError> {

src/compiletest/header.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ use util;
1414

1515
pub struct TestProps {
1616
// Lines that should be expected, in order, on standard out
17-
error_patterns: Vec<~str> ,
17+
pub error_patterns: Vec<~str> ,
1818
// Extra flags to pass to the compiler
19-
compile_flags: Option<~str>,
19+
pub compile_flags: Option<~str>,
2020
// If present, the name of a file that this test should match when
2121
// pretty-printed
22-
pp_exact: Option<Path>,
22+
pub pp_exact: Option<Path>,
2323
// Modules from aux directory that should be compiled
24-
aux_builds: Vec<~str> ,
24+
pub aux_builds: Vec<~str> ,
2525
// Environment settings to use during execution
26-
exec_env: Vec<(~str,~str)> ,
26+
pub exec_env: Vec<(~str,~str)> ,
2727
// Commands to be given to the debugger, when testing debug info
28-
debugger_cmds: Vec<~str> ,
28+
pub debugger_cmds: Vec<~str> ,
2929
// Lines to check if they appear in the expected debugger output
30-
check_lines: Vec<~str> ,
30+
pub check_lines: Vec<~str> ,
3131
// Flag to force a crate to be built with the host architecture
32-
force_host: bool,
32+
pub force_host: bool,
3333
// Check stdout for error-pattern output as well as stderr
34-
check_stdout: bool,
34+
pub check_stdout: bool,
3535
// Don't force a --crate-type=dylib flag on the command line
36-
no_prefer_dynamic: bool,
36+
pub no_prefer_dynamic: bool,
3737
}
3838

3939
// Load any test directives embedded in the file

src/compiletest/procsrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn target_env(lib_path: &str, prog: &str) -> Vec<(~str,~str)> {
5757
return env;
5858
}
5959

60-
pub struct Result {status: ProcessExit, out: ~str, err: ~str}
60+
pub struct Result {pub status: ProcessExit, pub out: ~str, pub err: ~str}
6161

6262
pub fn run(lib_path: &str,
6363
prog: &str,

0 commit comments

Comments
 (0)