Skip to content

Commit 1d2f3de

Browse files
committed
---
yaml --- r: 41981 b: refs/heads/master c: 3c24419 h: refs/heads/master i: 41979: eafbf88 v: v3
1 parent ca132f2 commit 1d2f3de

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e84576b888a6fbbac8de96206a3715dc80291acf
2+
refs/heads/master: 3c24419c196c8693118d2f72fb1947d2b6aec73f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/time.rs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,6 @@ mod tests {
902902
use core::uint;
903903
use core::vec;
904904

905-
#[test]
906905
fn test_get_time() {
907906
const some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
908907
const some_future_date: i64 = 1577836800i64; // 2020-01-01T00:00:00Z
@@ -926,7 +925,6 @@ mod tests {
926925
}
927926
}
928927

929-
#[test]
930928
fn test_precise_time() {
931929
let s0 = precise_time_s();
932930
let ns1 = precise_time_ns();
@@ -944,7 +942,6 @@ mod tests {
944942
assert ns2 >= ns1;
945943
}
946944

947-
#[test]
948945
fn test_at_utc() {
949946
os::setenv(~"TZ", ~"America/Los_Angeles");
950947
tzset();
@@ -966,7 +963,6 @@ mod tests {
966963
assert utc.tm_nsec == 54321_i32;
967964
}
968965

969-
#[test]
970966
fn test_at() {
971967
os::setenv(~"TZ", ~"America/Los_Angeles");
972968
tzset();
@@ -995,7 +991,6 @@ mod tests {
995991
assert local.tm_nsec == 54321_i32;
996992
}
997993

998-
#[test]
999994
fn test_to_timespec() {
1000995
os::setenv(~"TZ", ~"America/Los_Angeles");
1001996
tzset();
@@ -1007,7 +1002,6 @@ mod tests {
10071002
assert utc.to_local().to_timespec() == time;
10081003
}
10091004

1010-
#[test]
10111005
fn test_conversions() {
10121006
os::setenv(~"TZ", ~"America/Los_Angeles");
10131007
tzset();
@@ -1024,7 +1018,6 @@ mod tests {
10241018
assert utc.to_local().to_utc() == utc;
10251019
}
10261020

1027-
#[test]
10281021
fn test_strptime() {
10291022
os::setenv(~"TZ", ~"America/Los_Angeles");
10301023
tzset();
@@ -1179,8 +1172,6 @@ mod tests {
11791172
assert test(~"%", ~"%%");
11801173
}
11811174

1182-
#[test]
1183-
#[ignore(reason = "randomred")]
11841175
fn test_ctime() {
11851176
os::setenv(~"TZ", ~"America/Los_Angeles");
11861177
tzset();
@@ -1195,8 +1186,6 @@ mod tests {
11951186
assert local.ctime() == ~"Fri Feb 13 15:31:30 2009";
11961187
}
11971188

1198-
#[test]
1199-
#[ignore(reason = "randomred")]
12001189
fn test_strftime() {
12011190
os::setenv(~"TZ", ~"America/Los_Angeles");
12021191
tzset();
@@ -1270,7 +1259,6 @@ mod tests {
12701259
assert utc.rfc3339() == ~"2009-02-13T23:31:30Z";
12711260
}
12721261

1273-
#[test]
12741262
fn test_timespec_eq_ord() {
12751263
use core::cmp::{eq, ge, gt, le, lt, ne};
12761264

@@ -1303,4 +1291,20 @@ mod tests {
13031291
assert gt(c, b);
13041292
assert gt(d, c);
13051293
}
1294+
1295+
#[test]
1296+
fn run_tests() {
1297+
// The tests race on tzset. So instead of having many independent
1298+
// tests, we will just call the functions now.
1299+
test_get_time();
1300+
test_precise_time();
1301+
test_at_utc();
1302+
test_at();
1303+
test_to_timespec();
1304+
test_conversions();
1305+
test_strptime();
1306+
test_ctime();
1307+
test_strftime();
1308+
test_timespec_eq_ord();
1309+
}
13061310
}

0 commit comments

Comments
 (0)