Skip to content

Commit 2874504

Browse files
committed
---
yaml --- r: 82601 b: refs/heads/auto c: 6d03897 h: refs/heads/master i: 82599: 736a3c6 v: v3
1 parent 4698cf5 commit 2874504

File tree

8 files changed

+57
-119
lines changed

8 files changed

+57
-119
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: f285506b320f12d31dd75e759192e0252572471e
16+
refs/heads/auto: 6d03897376f8737e28a93693f90bd651e9d08e92
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/AUTHORS.txt

Lines changed: 7 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
Aaron Laursen <[email protected]>
2-
Aaron Todd <[email protected]>
1+
Initial author, project lead, target of blame:
2+
3+
Graydon Hoare <[email protected]>
4+
5+
Other authors:
6+
7+
38
Adam Bozanich <[email protected]>
4-
Adrien Tétar <[email protected]>
59
Aleksander Balicki <[email protected]>
610
Alex Crichton <[email protected]>
711
Alex Rønne Petersen <[email protected]>
812
Alexander Stavonin <[email protected]>
913
Alexei Sholik <[email protected]>
10-
Aljaž "g5pw" Srebrnič <[email protected]>
11-
Anders Kaseorg <[email protected]>
1214
Andreas Gal <[email protected]>
13-
Andreas Martens <[email protected]>
1415
Andrew Dunham <[email protected]>
1516
Andrew Paseltiner <[email protected]>
1617
Anthony Juckel <[email protected]>
1718
Arkaitz Jimenez <[email protected]>
1819
Armin Ronacher <[email protected]>
1920
Ashok Gautham <[email protected]>
20-
Austin King <[email protected]>
2121
Austin Seipp <[email protected]>
2222
Aydin Kim <[email protected]>
2323
@@ -33,12 +33,7 @@ Bilal Husain <[email protected]>
3333
Bill Fallon <[email protected]>
3434
Bill Myers <[email protected]>
3535
Bill Wendling <[email protected]>
36-
Birunthan Mohanathas <[email protected]>
3736
Björn Steinbrink <[email protected]>
38-
blake2-ppc <[email protected]>
39-
Bouke van der Bijl <[email protected]>
40-
Brandon Sanderson <[email protected]>
41-
Brendan Cully <[email protected]>
4237
Brendan Eich <[email protected]>
4338
Brendan Zabarauskas <[email protected]>
4439
Brett Cannon <[email protected]>
@@ -47,9 +42,7 @@ Brian J. Burg <[email protected]>
4742
Brian Leibig <[email protected]>
4843
Bryan Dunsmore <[email protected]>
4944
Caitlin Potter <[email protected]>
50-
5145
Chris Double <[email protected]>
52-
Chris Morgan <[email protected]>
5346
Chris Peterson <[email protected]>
5447
Chris Pressey <[email protected]>
5548
Cody Schroeder <[email protected]>
@@ -59,58 +52,39 @@ Damien Grassart <[email protected]>
5952
Damien Schoof <[email protected]>
6053
Daniel Brooks <[email protected]>
6154
Daniel Farina <[email protected]>
62-
Dan Connolly <[email protected]>
6355
6456
Daniel Luz <[email protected]>
6557
Daniel Micay <[email protected]>
6658
Daniel Patterson <[email protected]>
6759
Daniel Ralston <[email protected]>
68-
Daniel Rosenwasser <[email protected]>
6960
Daniel Ursache Dogariu <[email protected]>
70-
7161
Dave Herman <[email protected]>
72-
David Creswick <[email protected]>
7362
David Forsythe <[email protected]>
74-
David Halperin <[email protected]>
7563
David Klein <[email protected]>
76-
David Manescu <[email protected]>
7764
David Rajchenbach-Teller <[email protected]>
7865
Diggory Hardy <[email protected]>
7966
Dimitri Krassovski <[email protected]>
80-
Dmitry Ermolov <[email protected]>
81-
Do Nhat Minh <[email protected]>
8267
Donovan Preston <[email protected]>
8368
Drew Willcoxon <[email protected]>
8469
Elliott Slaughter <[email protected]>
8570
Elly Fong-Jones <[email protected]>
8671
Eric Holk <[email protected]>
8772
Eric Holmes <[email protected]>
88-
Eric Martin <[email protected]>
89-
Eric Reed <[email protected]>
9073
Erick Tryzelaar <[email protected]>
9174
Erik Rose <[email protected]>
92-
Etienne Millon <[email protected]>
9375
Evan McClanahan <[email protected]>
9476
Fedor Indutny <[email protected]>
9577
Felix S. Klock II <[email protected]>
96-
Flaper Fesp <[email protected]>
97-
Flavio Percoco <[email protected]>
98-
Florian Hahn <[email protected]>
99-
Florian Zeitz <[email protected]>
10078
Francisco Souza <[email protected]>
10179
Franklin Chen <[email protected]>
10280
Gábor Horváth <[email protected]>
10381
10482
Gareth Daniel Smith <[email protected]>
105-
Gary Linscott <[email protected]>
106-
Georges Dubus <[email protected]>
10783
10884
Glenn Willen <[email protected]>
10985
Gonçalo Cabrita <[email protected]>
11086
Graham Fawcett <[email protected]>
11187
Grahame Bowland <[email protected]>
112-
Graydon Hoare <[email protected]>
113-
11488
Haitao Li <[email protected]>
11589
11690
Herman J. Radtke III <[email protected]>
@@ -122,11 +96,9 @@ Ivano Coppola <[email protected]>
12296
Jack Moffitt <[email protected]>
12397
Jacob Harris Cryer Kragh <[email protected]>
12498
Jacob Parker <[email protected]>
125-
12699
Jakub Wieczorek <[email protected]>
127100
James Miller <[email protected]>
128101
James Tranovich <[email protected]>
129-
Jan Kobler <[email protected]>
130102
Jason Orendorff <[email protected]>
131103
Jed Davis <[email protected]>
132104
Jeff Balogh <[email protected]>
@@ -141,48 +113,35 @@ Jesse Ruderman <[email protected]>
141113
Jihyun Yu <[email protected]>
142114
Jim Blandy <[email protected]>
143115
144-
Jimmy Zelinskie <[email protected]>
145116
J. J. Weber <[email protected]>
146-
147117
Joe Pletcher <[email protected]>
148-
John Barker <[email protected]>
149118
John Clements <[email protected]>
150119
Jon Morton <[email protected]>
151120
Jonathan Sternberg <[email protected]>
152-
Jordi Boggiano <[email protected]>
153121
Josh Matthews <[email protected]>
154122
Joshua Clark <[email protected]>
155123
Joshua Wise <[email protected]>
156124
Junyoung Cho <[email protected]>
157125
Jyun-Yan You <[email protected]>
158126
Kang Seonghoon <[email protected]>
159-
Keegan McAllister <[email protected]>
160127
Kelly Wilson <[email protected]>
161128
Kevin Atkinson <[email protected]>
162129
Kevin Ballard <[email protected]>
163130
Kevin Cantu <[email protected]>
164-
Kevin Mehall <[email protected]>
165-
Kevin Murphy <[email protected]>
166131
167-
korenchkin <[email protected]>
168132
Kyeongwoon Lee <[email protected]>
169-
Lars Bergstrom <[email protected]>
170133
Laurent Bonnans <[email protected]>
171134
Lawrence Velázquez <[email protected]>
172135
Leah Hanson <[email protected]>
173136
Lennart Kudling <[email protected]>
174137
Lindsey Kuper <[email protected]>
175138
Luca Bruno <[email protected]>
176-
Luis de Bethencourt <[email protected]>
177139
Luqman Aden <[email protected]>
178140
Magnus Auvinen <[email protected]>
179141
Mahmut Bulut <[email protected]>
180-
maikklein <[email protected]>
181-
Makoto Nakashima <[email protected]>
182142
Margaret Meyerhofer <[email protected]>
183143
Marijn Haverbeke <[email protected]>
184144
Mark Lacey <[email protected]>
185-
Mark Sinclair <[email protected]>
186145
Mark Vian <[email protected]>
187146
Marti Raudsepp <[email protected]>
188147
Martin DeMello <[email protected]>
@@ -192,27 +151,18 @@ Matthew McPherrin <[email protected]>
192151
Matthew O'Connor <[email protected]>
193152
Matthijs Hofstra <[email protected]>
194153
Max Penet <[email protected]>
195-
Maxim Kolganov <[email protected]>
196-
Micah Chalmer <[email protected]>
197154
Michael Arntzenius <[email protected]>
198155
Michael Bebenita <[email protected]>
199156
Michael Neumann <[email protected]>
200157
Michael Sullivan <[email protected]>
201-
Michael Woerister <michaelwoerister@gmail>
202-
Mihnea Dobrescu-Balaur <[email protected]>
203158
Mikko Perttunen <[email protected]>
204-
Mukilan Thiagarajan <[email protected]>
205159
Nick Desaulniers <[email protected]>
206160
Niko Matsakis <[email protected]>
207-
208-
Ogino Masanori <[email protected]>
209161
Olivier Saut <[email protected]>
210162
Or Brostovski <[email protected]>
211163
Orphée Lafond-Lummis <[email protected]>
212-
Palmer Cox <[email protected]>
213164
Patrick Walton <[email protected]>
214165
Patrik Kårlin <[email protected]>
215-
Paul Collins <[email protected]>
216166
Paul Stansifer <[email protected]>
217167
Paul Woolcock <[email protected]>
218168
Pavel Panchekha <[email protected]>
@@ -227,32 +177,25 @@ Reuben Morais <[email protected]>
227177
Rick Waldron <[email protected]>
228178
Rob Arnold <[email protected]>
229179
Rob Hoelz <[email protected]>
230-
Robert Knight <[email protected]>
231-
Robert Millar <[email protected]>
232180
Roland Tanglao <[email protected]>
233181
Ron Dahlgren <[email protected]>
234182
Roy Frostig <[email protected]>
235183
Ryan Scheel <[email protected]>
236184
Samuel Chase <[email protected]>
237185
Sander Mathijs van Veen <[email protected]>
238186
Sangeun Kim <[email protected]>
239-
Sankha Narayan Guria <[email protected]>
240187
Saurabh Anand <[email protected]>
241-
Scott Lawrence <[email protected]>
242188
Sean Moon <[email protected]>
243189
Sean Stangl <[email protected]>
244190
Sebastian N. Fernandez <[email protected]>
245-
Sébastien Crozet <[email protected]>
246191
Seth Pink <[email protected]>
247192
Seo Sanghyeon <[email protected]>
248193
249194
SiegeLord <[email protected]>
250195
Simon Barber-Dueck <[email protected]>
251196
Simon Sapin <[email protected]>
252-
sp3d <sp3d@github>
253197
startling <[email protected]>
254198
Stefan Plantikow <[email protected]>
255-
Stepan Koltsov <[email protected]>
256199
Steve Klabnik <[email protected]>
257200
Steven De Coeyer <[email protected]>
258201
Steven Fackler <[email protected]>
@@ -262,7 +205,6 @@ Ted Horst <[email protected]>
262205
Thad Guidry <[email protected]>
263206
Thomas Daede <[email protected]>
264207
Tim Chevalier <[email protected]>
265-
Tim Kuehn <[email protected]>
266208
Tim Taubert <[email protected]>
267209
268210
Tommy M. McGuire <[email protected]>
@@ -271,7 +213,6 @@ Tony Young <[email protected]>
271213
272214
Tycho Sci <[email protected]>
273215
Tyler Bindon <[email protected]>
274-
U-NOV2010\eugals
275216
Uwe Dauernheim <[email protected]>
276217
Vadim Chugunov <[email protected]>
277218
Viktor Dahl <[email protected]>
@@ -284,5 +225,4 @@ Young-il Choi <[email protected]>
284225
Youngmin Yoo <[email protected]>
285226
Youngsoo Son <[email protected]>
286227
Zack Corr <[email protected]>
287-
Zack Slayton <[email protected]>
288228

branches/auto/src/libextra/test.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use treemap::TreeMap;
3030

3131
use std::clone::Clone;
3232
use std::comm::{stream, SharedChan, GenericPort, GenericChan};
33-
use std::libc;
3433
use std::io;
3534
use std::result;
3635
use std::task;
@@ -125,8 +124,9 @@ pub type MetricDiff = TreeMap<~str,MetricChange>;
125124
pub fn test_main(args: &[~str], tests: ~[TestDescAndFn]) {
126125
let opts =
127126
match parse_opts(args) {
128-
Ok(o) => o,
129-
Err(msg) => fail!(msg)
127+
Some(Ok(o)) => o,
128+
Some(Err(msg)) => fail!(msg),
129+
None => return
130130
};
131131
if !run_tests_console(&opts, tests) { fail!("Some tests failed"); }
132132
}
@@ -189,7 +189,7 @@ fn optgroups() -> ~[getopts::groups::OptGroup] {
189189
"A.B")]
190190
}
191191

192-
fn usage(binary: &str, helpstr: &str) -> ! {
192+
fn usage(binary: &str, helpstr: &str) {
193193
#[fixed_stack_segment]; #[inline(never)];
194194

195195
let message = fmt!("Usage: %s [OPTIONS] [FILTER]", binary);
@@ -217,20 +217,19 @@ Test Attributes:
217217
tests. This may also be written as #[ignore(cfg(...))] to
218218
ignore the test on certain configurations.");
219219
}
220-
unsafe { libc::exit(0) }
221220
}
222221

223222
// Parses command line arguments into test options
224-
pub fn parse_opts(args: &[~str]) -> OptRes {
223+
pub fn parse_opts(args: &[~str]) -> Option<OptRes> {
225224
let args_ = args.tail();
226225
let matches =
227226
match groups::getopts(args_, optgroups()) {
228227
Ok(m) => m,
229-
Err(f) => return Err(f.to_err_msg())
228+
Err(f) => return Some(Err(f.to_err_msg()))
230229
};
231230

232-
if matches.opt_present("h") { usage(args[0], "h"); }
233-
if matches.opt_present("help") { usage(args[0], "help"); }
231+
if matches.opt_present("h") { usage(args[0], "h"); return None; }
232+
if matches.opt_present("help") { usage(args[0], "help"); return None; }
234233

235234
let filter =
236235
if matches.free.len() > 0 {
@@ -272,7 +271,7 @@ pub fn parse_opts(args: &[~str]) -> OptRes {
272271
logfile: logfile
273272
};
274273

275-
Ok(test_opts)
274+
Some(Ok(test_opts))
276275
}
277276

278277
pub fn opt_shard(maybestr: Option<~str>) -> Option<(uint,uint)> {
@@ -1228,7 +1227,7 @@ mod tests {
12281227
fn first_free_arg_should_be_a_filter() {
12291228
let args = ~[~"progname", ~"filter"];
12301229
let opts = match parse_opts(args) {
1231-
Ok(o) => o,
1230+
Some(Ok(o)) => o,
12321231
_ => fail!("Malformed arg in first_free_arg_should_be_a_filter")
12331232
};
12341233
assert!("filter" == opts.filter.clone().unwrap());
@@ -1238,7 +1237,7 @@ mod tests {
12381237
fn parse_ignored_flag() {
12391238
let args = ~[~"progname", ~"filter", ~"--ignored"];
12401239
let opts = match parse_opts(args) {
1241-
Ok(o) => o,
1240+
Some(Ok(o)) => o,
12421241
_ => fail!("Malformed arg in parse_ignored_flag")
12431242
};
12441243
assert!((opts.run_ignored));

0 commit comments

Comments
 (0)