Skip to content

Commit 78768c1

Browse files
steveklabniksteveklabnik
committed
---
yaml --- r: 152862 b: refs/heads/try2 c: cccae83 h: refs/heads/master v: v3
1 parent a8824b8 commit 78768c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+428
-394
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 99519cc8e645dd50522c2f32cf55ef8c15583012
8+
refs/heads/try2: cccae83d922f5aade2b7cca96579521cc35ced59
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/src/compiletest/compiletest.rs

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ fn start(argc: int, argv: **u8) -> int {
4848

4949
pub fn main() {
5050
let args = os::args();
51-
let config = parse_config(args);
51+
let config = parse_config(args.move_iter()
52+
.map(|x| x.to_string())
53+
.collect());
5254
log_config(&config);
5355
run_tests(&config);
5456
}
@@ -129,15 +131,17 @@ pub fn parse_config(args: Vec<String> ) -> Config {
129131
};
130132

131133
Config {
132-
compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
133-
run_lib_path: matches.opt_str("run-lib-path").unwrap(),
134+
compile_lib_path: matches.opt_str("compile-lib-path")
135+
.unwrap()
136+
.to_string(),
137+
run_lib_path: matches.opt_str("run-lib-path").unwrap().to_string(),
134138
rustc_path: opt_path(matches, "rustc-path"),
135139
clang_path: matches.opt_str("clang-path").map(|s| Path::new(s)),
136140
llvm_bin_path: matches.opt_str("llvm-bin-path").map(|s| Path::new(s)),
137141
src_base: opt_path(matches, "src-base"),
138142
build_base: opt_path(matches, "build-base"),
139143
aux_base: opt_path(matches, "aux-base"),
140-
stage_id: matches.opt_str("stage-id").unwrap(),
144+
stage_id: matches.opt_str("stage-id").unwrap().to_string(),
141145
mode: FromStr::from_str(matches.opt_str("mode")
142146
.unwrap()
143147
.as_slice()).expect("invalid mode"),
@@ -151,23 +155,32 @@ pub fn parse_config(args: Vec<String> ) -> Config {
151155
ratchet_noise_percent:
152156
matches.opt_str("ratchet-noise-percent")
153157
.and_then(|s| from_str::<f64>(s.as_slice())),
154-
runtool: matches.opt_str("runtool"),
155-
host_rustcflags: matches.opt_str("host-rustcflags"),
156-
target_rustcflags: matches.opt_str("target-rustcflags"),
158+
runtool: matches.opt_str("runtool").map(|x| x.to_string()),
159+
host_rustcflags: matches.opt_str("host-rustcflags")
160+
.map(|x| x.to_string()),
161+
target_rustcflags: matches.opt_str("target-rustcflags")
162+
.map(|x| x.to_string()),
157163
jit: matches.opt_present("jit"),
158-
target: opt_str2(matches.opt_str("target")),
159-
host: opt_str2(matches.opt_str("host")),
164+
target: opt_str2(matches.opt_str("target").map(|x| x.to_string())),
165+
host: opt_str2(matches.opt_str("host").map(|x| x.to_string())),
160166
android_cross_path: opt_path(matches, "android-cross-path"),
161-
adb_path: opt_str2(matches.opt_str("adb-path")),
162-
adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")),
167+
adb_path: opt_str2(matches.opt_str("adb-path")
168+
.map(|x| x.to_string())),
169+
adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")
170+
.map(|x| x.to_string())),
163171
adb_device_status:
164172
"arm-linux-androideabi" ==
165-
opt_str2(matches.opt_str("target")).as_slice() &&
173+
opt_str2(matches.opt_str("target")
174+
.map(|x| x.to_string())).as_slice() &&
166175
"(none)" !=
167-
opt_str2(matches.opt_str("adb-test-dir")).as_slice() &&
168-
!opt_str2(matches.opt_str("adb-test-dir")).is_empty(),
169-
lldb_python_dir: matches.opt_str("lldb-python-dir"),
170-
test_shard: test::opt_shard(matches.opt_str("test-shard")),
176+
opt_str2(matches.opt_str("adb-test-dir")
177+
.map(|x| x.to_string())).as_slice() &&
178+
!opt_str2(matches.opt_str("adb-test-dir")
179+
.map(|x| x.to_string())).is_empty(),
180+
lldb_python_dir: matches.opt_str("lldb-python-dir")
181+
.map(|x| x.to_string()),
182+
test_shard: test::opt_shard(matches.opt_str("test-shard")
183+
.map(|x| x.to_string())),
171184
verbose: matches.opt_present("verbose")
172185
}
173186
}

‎branches/try2/src/compiletest/header.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,23 @@ fn iter_header(testfile: &Path, it: |&str| -> bool) -> bool {
170170
}
171171

172172
fn parse_error_pattern(line: &str) -> Option<String> {
173-
parse_name_value_directive(line, "error-pattern")
173+
parse_name_value_directive(line, "error-pattern".to_string())
174174
}
175175

176176
fn parse_aux_build(line: &str) -> Option<String> {
177-
parse_name_value_directive(line, "aux-build")
177+
parse_name_value_directive(line, "aux-build".to_string())
178178
}
179179

180180
fn parse_compile_flags(line: &str) -> Option<String> {
181-
parse_name_value_directive(line, "compile-flags")
181+
parse_name_value_directive(line, "compile-flags".to_string())
182182
}
183183

184184
fn parse_run_flags(line: &str) -> Option<String> {
185-
parse_name_value_directive(line, "run-flags")
185+
parse_name_value_directive(line, "run-flags".to_string())
186186
}
187187

188188
fn parse_check_line(line: &str) -> Option<String> {
189-
parse_name_value_directive(line, "check")
189+
parse_name_value_directive(line, "check".to_string())
190190
}
191191

192192
fn parse_force_host(line: &str) -> bool {
@@ -206,7 +206,7 @@ fn parse_no_pretty_expanded(line: &str) -> bool {
206206
}
207207

208208
fn parse_exec_env(line: &str) -> Option<(String, String)> {
209-
parse_name_value_directive(line, "exec-env").map(|nv| {
209+
parse_name_value_directive(line, "exec-env".to_string()).map(|nv| {
210210
// nv is either FOO or FOO=BAR
211211
let mut strs: Vec<String> = nv.as_slice()
212212
.splitn('=', 1)
@@ -225,7 +225,7 @@ fn parse_exec_env(line: &str) -> Option<(String, String)> {
225225
}
226226

227227
fn parse_pp_exact(line: &str, testfile: &Path) -> Option<Path> {
228-
match parse_name_value_directive(line, "pp-exact") {
228+
match parse_name_value_directive(line, "pp-exact".to_string()) {
229229
Some(s) => Some(Path::new(s)),
230230
None => {
231231
if parse_name_directive(line, "pp-exact") {
@@ -241,7 +241,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool {
241241
line.contains(directive)
242242
}
243243

244-
pub fn parse_name_value_directive(line: &str, directive: &str)
244+
pub fn parse_name_value_directive(line: &str, directive: String)
245245
-> Option<String> {
246246
let keycolon = format!("{}:", directive);
247247
match line.find_str(keycolon.as_slice()) {

0 commit comments

Comments
 (0)