Skip to content

Commit c3a6ad3

Browse files
ManishearthManishearth
committed
---
yaml --- r: 179131 b: refs/heads/auto c: 5c172ad h: refs/heads/master i: 179129: 69e1c60 179127: 4c843f3 v: v3
1 parent adffae0 commit c3a6ad3

File tree

344 files changed

+1756
-1616
lines changed

Some content is hidden

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

344 files changed

+1756
-1616
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 023a931309c17dab1b9d2332369626a26a5227cc
13+
refs/heads/auto: 5c172ad03cee9274028ae8333338845002eeec9a
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
# * check-stage$(stage)-$(crate) - Test a crate in a specific stage
6060
# * check-stage$(stage)-{rpass,rfail,cfail,rmake,...} - Run tests in src/test/
6161
# * check-stage1-T-$(target)-H-$(host) - Run cross-compiled-tests
62+
# * tidy-basic - show file / line stats
63+
# * tidy-errors - show the highest rustc error code
64+
# * tidy-features - show the status of language and lib features
6265
#
6366
# Then mix in some of these environment variables to harness the
6467
# ultimate power of The Rust Build System.

‎branches/auto/mk/main.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ endif
7272
# numbers and dots here
7373
CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
7474

75+
CFG_INFO := $(info cfg: version $(CFG_VERSION))
7576

7677
######################################################################
7778
# More configuration
@@ -179,6 +180,7 @@ endif
179180

180181
ifndef CFG_DISABLE_VALGRIND_RPASS
181182
$(info cfg: enabling valgrind run-pass tests (CFG_ENABLE_VALGRIND_RPASS))
183+
$(info cfg: valgrind-rpass command set to $(CFG_VALGRIND))
182184
CFG_VALGRIND_RPASS :=$(CFG_VALGRIND)
183185
else
184186
CFG_VALGRIND_RPASS :=

‎branches/auto/mk/tests.mk

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
162162
######################################################################
163163

164164
# The main testing target. Tests lots of stuff.
165-
check: cleantmptestlogs cleantestlibs check-notidy tidy
165+
check: cleantmptestlogs cleantestlibs all check-stage2 tidy
166+
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
166167

167168
# As above but don't bother running tidy.
168169
check-notidy: cleantmptestlogs cleantestlibs all check-stage2
@@ -235,57 +236,24 @@ cleantestlibs:
235236
######################################################################
236237

237238
ifdef CFG_NOTIDY
239+
.PHONY: tidy
238240
tidy:
239241
else
240242

241-
ALL_CS := $(wildcard $(S)src/rt/*.cpp \
242-
$(S)src/rt/*/*.cpp \
243-
$(S)src/rt/*/*/*.cpp \
244-
$(S)src/rustllvm/*.cpp)
245-
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
246-
$(wildcard $(S)src/rt/hoedown/src/*.c) \
247-
$(wildcard $(S)src/rt/hoedown/bin/*.c) \
248-
,$(ALL_CS))
249-
ALL_HS := $(wildcard $(S)src/rt/*.h \
250-
$(S)src/rt/*/*.h \
251-
$(S)src/rt/*/*/*.h \
252-
$(S)src/rustllvm/*.h)
253-
ALL_HS := $(filter-out $(S)src/rt/valgrind/valgrind.h \
254-
$(S)src/rt/valgrind/memcheck.h \
255-
$(S)src/rt/msvc/typeof.h \
256-
$(S)src/rt/msvc/stdint.h \
257-
$(S)src/rt/msvc/inttypes.h \
258-
$(wildcard $(S)src/rt/hoedown/src/*.h) \
259-
$(wildcard $(S)src/rt/hoedown/bin/*.h) \
260-
,$(ALL_HS))
261-
262243
# Run the tidy script in multiple parts to avoid huge 'echo' commands
263-
tidy:
244+
.PHONY: tidy
245+
tidy: tidy-basic tidy-binaries tidy-errors tidy-features
246+
247+
endif
248+
249+
.PHONY: tidy-basic
250+
tidy-basic:
264251
@$(call E, check: formatting)
265-
$(Q)find $(S)src -name '*.r[sc]' \
266-
-and -not -regex '^$(S)src/jemalloc.*' \
267-
-and -not -regex '^$(S)src/libuv.*' \
268-
-and -not -regex '^$(S)src/llvm.*' \
269-
-and -not -regex '^$(S)src/gyp.*' \
270-
-and -not -regex '^$(S)src/libbacktrace.*' \
271-
-print0 \
272-
| xargs -0 -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
273-
$(Q)find $(S)src/etc -name '*.py' \
274-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
275-
$(Q)find $(S)src/doc -name '*.js' \
276-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
277-
$(Q)find $(S)src/etc -name '*.sh' \
278-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
279-
$(Q)find $(S)src/etc -name '*.pl' \
280-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
281-
$(Q)find $(S)src/etc -name '*.c' \
282-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
283-
$(Q)find $(S)src/etc -name '*.h' \
284-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
285-
$(Q)echo $(ALL_CS) \
286-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
287-
$(Q)echo $(ALL_HS) \
288-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
252+
$(Q) $(CFG_PYTHON) $(S)src/etc/tidy.py $(S)src/
253+
254+
.PHONY: tidy-binaries
255+
tidy-binaries:
256+
@$(call E, check: binaries)
289257
$(Q)find $(S)src -type f -perm +a+x \
290258
-not -name '*.rs' -and -not -name '*.py' \
291259
-and -not -name '*.sh' \
@@ -300,11 +268,16 @@ tidy:
300268
| grep '^$(S)src/libbacktrace' -v \
301269
| grep '^$(S)src/rust-installer' -v \
302270
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
303-
$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
304-
$(Q) $(CFG_PYTHON) $(S)src/etc/featureck.py $(S)src/
305271

272+
.PHONY: tidy-errors
273+
tidy-errors:
274+
@$(call E, check: extended errors)
275+
$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
306276

307-
endif
277+
.PHONY: tidy-features
278+
tidy-features:
279+
@$(call E, check: feature sanity)
280+
$(Q) $(CFG_PYTHON) $(S)src/etc/featureck.py $(S)src/
308281

309282

310283
######################################################################
@@ -639,7 +612,6 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
639612

640613
ifdef CFG_VALGRIND_RPASS
641614
ifdef GOOD_VALGRIND_$(2)
642-
$(info cfg: valgrind-path set to $(CFG_VALGRIND_RPASS))
643615
CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) += --valgrind-path "$(CFG_VALGRIND_RPASS)"
644616
endif
645617
endif

‎branches/auto/src/compiletest/compiletest.rs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,28 +97,31 @@ pub fn parse_config(args: Vec<String> ) -> Config {
9797
assert!(!args.is_empty());
9898
let argv0 = args[0].clone();
9999
let args_ = args.tail();
100-
if args[1].as_slice() == "-h" || args[1].as_slice() == "--help" {
100+
if args[1] == "-h" || args[1] == "--help" {
101101
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
102-
println!("{}", getopts::usage(message.as_slice(), groups.as_slice()));
102+
println!("{}", getopts::usage(&message, &groups));
103103
println!("");
104104
panic!()
105105
}
106106

107107
let matches =
108-
&match getopts::getopts(args_.as_slice(), groups.as_slice()) {
108+
&match getopts::getopts(args_, &groups) {
109109
Ok(m) => m,
110110
Err(f) => panic!("{:?}", f)
111111
};
112112

113113
if matches.opt_present("h") || matches.opt_present("help") {
114114
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
115-
println!("{}", getopts::usage(message.as_slice(), groups.as_slice()));
115+
println!("{}", getopts::usage(&message, &groups));
116116
println!("");
117117
panic!()
118118
}
119119

120120
fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
121-
Path::new(m.opt_str(nm).unwrap())
121+
match m.opt_str(nm) {
122+
Some(s) => Path::new(s),
123+
None => panic!("no option (=path) found for {}", nm),
124+
}
122125
}
123126

124127
let filter = if !matches.free.is_empty() {
@@ -156,9 +159,9 @@ pub fn parse_config(args: Vec<String> ) -> Config {
156159
adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")),
157160
adb_device_status:
158161
"arm-linux-androideabi" ==
159-
opt_str2(matches.opt_str("target")).as_slice() &&
162+
opt_str2(matches.opt_str("target")) &&
160163
"(none)" !=
161-
opt_str2(matches.opt_str("adb-test-dir")).as_slice() &&
164+
opt_str2(matches.opt_str("adb-test-dir")) &&
162165
!opt_str2(matches.opt_str("adb-test-dir")).is_empty(),
163166
lldb_python_dir: matches.opt_str("lldb-python-dir"),
164167
verbose: matches.opt_present("verbose"),
@@ -201,7 +204,7 @@ pub fn log_config(config: &Config) {
201204
pub fn opt_str<'a>(maybestr: &'a Option<String>) -> &'a str {
202205
match *maybestr {
203206
None => "(none)",
204-
Some(ref s) => s.as_slice(),
207+
Some(ref s) => s,
205208
}
206209
}
207210

@@ -213,7 +216,7 @@ pub fn opt_str2(maybestr: Option<String>) -> String {
213216
}
214217

215218
pub fn run_tests(config: &Config) {
216-
if config.target.as_slice() == "arm-linux-androideabi" {
219+
if config.target == "arm-linux-androideabi" {
217220
match config.mode {
218221
DebugInfoGdb => {
219222
println!("arm-linux-androideabi debug-info \
@@ -306,13 +309,13 @@ pub fn is_test(config: &Config, testfile: &Path) -> bool {
306309
let mut valid = false;
307310

308311
for ext in &valid_extensions {
309-
if name.ends_with(ext.as_slice()) {
312+
if name.ends_with(ext) {
310313
valid = true;
311314
}
312315
}
313316

314317
for pre in &invalid_prefixes {
315-
if name.starts_with(pre.as_slice()) {
318+
if name.starts_with(pre) {
316319
valid = false;
317320
}
318321
}

‎branches/auto/src/compiletest/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn load_errors(testfile: &Path) -> Vec<ExpectedError> {
4444
rdr.lines().enumerate().filter_map(|(line_no, ln)| {
4545
parse_expected(last_nonfollow_error,
4646
line_no + 1,
47-
ln.unwrap().as_slice())
47+
&ln.unwrap())
4848
.map(|(which, error)| {
4949
match which {
5050
FollowPrevious(_) => {}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub fn load_props(testfile: &Path) -> TestProps {
145145

146146
pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
147147
fn ignore_target(config: &Config) -> String {
148-
format!("ignore-{}", util::get_os(config.target.as_slice()))
148+
format!("ignore-{}", util::get_os(&config.target))
149149
}
150150
fn ignore_stage(config: &Config) -> String {
151151
format!("ignore-{}",
@@ -169,8 +169,8 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
169169
.expect("Malformed GDB version directive");
170170
// Ignore if actual version is smaller the minimum required
171171
// version
172-
gdb_version_to_int(actual_version.as_slice()) <
173-
gdb_version_to_int(min_version.as_slice())
172+
gdb_version_to_int(actual_version) <
173+
gdb_version_to_int(min_version)
174174
} else {
175175
false
176176
}
@@ -197,8 +197,8 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
197197
.expect("Malformed lldb version directive");
198198
// Ignore if actual version is smaller the minimum required
199199
// version
200-
lldb_version_to_int(actual_version.as_slice()) <
201-
lldb_version_to_int(min_version.as_slice())
200+
lldb_version_to_int(actual_version) <
201+
lldb_version_to_int(min_version)
202202
} else {
203203
false
204204
}
@@ -209,8 +209,8 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
209209

210210
let val = iter_header(testfile, |ln| {
211211
!parse_name_directive(ln, "ignore-test") &&
212-
!parse_name_directive(ln, ignore_target(config).as_slice()) &&
213-
!parse_name_directive(ln, ignore_stage(config).as_slice()) &&
212+
!parse_name_directive(ln, &ignore_target(config)) &&
213+
!parse_name_directive(ln, &ignore_stage(config)) &&
214214
!(config.mode == common::Pretty && parse_name_directive(ln, "ignore-pretty")) &&
215215
!(config.target != config.host && parse_name_directive(ln, "ignore-cross-compile")) &&
216216
!ignore_gdb(config, ln) &&
@@ -294,7 +294,7 @@ fn parse_pretty_compare_only(line: &str) -> bool {
294294
fn parse_exec_env(line: &str) -> Option<(String, String)> {
295295
parse_name_value_directive(line, "exec-env").map(|nv| {
296296
// nv is either FOO or FOO=BAR
297-
let mut strs: Vec<String> = nv.as_slice()
297+
let mut strs: Vec<String> = nv
298298
.splitn(1, '=')
299299
.map(|s| s.to_string())
300300
.collect();
@@ -330,7 +330,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool {
330330
pub fn parse_name_value_directive(line: &str, directive: &str)
331331
-> Option<String> {
332332
let keycolon = format!("{}:", directive);
333-
match line.find_str(keycolon.as_slice()) {
333+
match line.find_str(&keycolon) {
334334
Some(colon) => {
335335
let value = line[(colon + keycolon.len()) .. line.len()].to_string();
336336
debug!("{}: {}", directive, value);
@@ -344,16 +344,16 @@ pub fn gdb_version_to_int(version_string: &str) -> int {
344344
let error_string = format!(
345345
"Encountered GDB version string with unexpected format: {}",
346346
version_string);
347-
let error_string = error_string.as_slice();
347+
let error_string = error_string;
348348

349349
let components: Vec<&str> = version_string.trim().split('.').collect();
350350

351351
if components.len() != 2 {
352352
panic!("{}", error_string);
353353
}
354354

355-
let major: int = components[0].parse().ok().expect(error_string);
356-
let minor: int = components[1].parse().ok().expect(error_string);
355+
let major: int = components[0].parse().ok().expect(&error_string);
356+
let minor: int = components[1].parse().ok().expect(&error_string);
357357

358358
return major * 1000 + minor;
359359
}
@@ -362,7 +362,7 @@ pub fn lldb_version_to_int(version_string: &str) -> int {
362362
let error_string = format!(
363363
"Encountered LLDB version string with unexpected format: {}",
364364
version_string);
365-
let error_string = error_string.as_slice();
366-
let major: int = version_string.parse().ok().expect(error_string);
365+
let error_string = error_string;
366+
let major: int = version_string.parse().ok().expect(&error_string);
367367
return major;
368368
}

‎branches/auto/src/compiletest/procsrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
2323

2424
// Add the new dylib search path var
2525
let var = DynamicLibrary::envvar();
26-
let newpath = DynamicLibrary::create_path(path.as_slice());
26+
let newpath = DynamicLibrary::create_path(&path);
2727
let newpath = String::from_utf8(newpath).unwrap();
2828
cmd.env(var.to_string(), newpath);
2929
}

0 commit comments

Comments
 (0)