---

yaml
---
r: 12894
b: refs/heads/master
c: e7ca3e4
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 047f629b31e1af929923b54239d83059263d995b
+refs/heads/master: e7ca3e4db02d7d87dd7a2172394e08fbb92b8fb2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/time.rs

@@ -7,6 +7,7 @@ export
     get_time,
     precise_time_ns,
     precise_time_s,
+    tzset,
     tm,
     empty_tm,
     now,
@@ -20,6 +21,7 @@ native mod rustrt {
     fn get_time(&sec: i64, &nsec: i32);
     fn precise_time_ns(&ns: u64);
 
+    fn rust_tzset();
     // FIXME: The i64 values can be passed by-val when #2064 is fixed.
     fn rust_gmtime(&&sec: i64, &&nsec: i32, &&result: tm);
     fn rust_localtime(&&sec: i64, &&nsec: i32, &&result: tm);
@@ -59,6 +61,10 @@ fn precise_time_s() -> float {
     ret (precise_time_ns() as float) / 1000000000.;
 }
 
+fn tzset() {
+    rustrt::rust_tzset();
+}
+
 type tm = {
     tm_sec: i32, // seconds after the minute [0-60]
     tm_min: i32, // minutes after the hour [0-59]
@@ -869,6 +875,7 @@ mod tests {
     #[test]
     fn test_at_utc() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let utc = at_utc(time);
@@ -890,10 +897,13 @@ mod tests {
     #[test]
     fn test_at() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let local = at(time);
 
+        #error("time_at: %?", local);
+
         assert local.tm_sec == 30_i32;
         assert local.tm_min == 31_i32;
         assert local.tm_hour == 15_i32;
@@ -916,6 +926,7 @@ mod tests {
     #[test]
     fn test_to_timespec() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let utc = at_utc(time);
@@ -927,6 +938,7 @@ mod tests {
     #[test]
     fn test_conversions() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let utc = at_utc(time);
@@ -943,6 +955,7 @@ mod tests {
     #[test]
     fn test_strptime() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         alt strptime("", "") {
           ok(tm) {
@@ -1088,18 +1101,22 @@ mod tests {
     #[test]
     fn test_ctime() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let utc   = at_utc(time);
         let local = at(time);
 
+        #error("test_ctime: %? %?", utc.ctime(), local.ctime());
+
         assert utc.ctime()   == "Fri Feb 13 23:31:30 2009";
         assert local.ctime() == "Fri Feb 13 15:31:30 2009";
     }
 
     #[test]
     fn test_strftime() {
         os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = { sec: 1234567890_i64, nsec: 54321_i32 };
         let utc = at_utc(time);

trunk/src/rt/rust_builtin.cpp

@@ -529,6 +529,11 @@ struct tm* LOCALTIME(const time_t *clock, tm *result) {
 #define TIMEGM(result) timegm(result)
 #endif
 
+extern "C" CDECL void
+rust_tzset() {
+    TZSET();
+}
+
 extern "C" CDECL void
 rust_gmtime(int64_t *sec, int32_t *nsec, rust_tm *timeptr) {
     tm tm;
@@ -541,7 +546,6 @@ rust_gmtime(int64_t *sec, int32_t *nsec, rust_tm *timeptr) {
 extern "C" CDECL void
 rust_localtime(int64_t *sec, int32_t *nsec, rust_tm *timeptr) {
     tm tm;
-    TZSET();
     time_t s = *sec;
     LOCALTIME(&s, &tm);
 

trunk/src/rt/rustrt.def.in

@@ -12,6 +12,7 @@ debug_abi_2
 get_port_id
 get_task_id
 get_time
+rust_tzset
 rust_gmtime
 rust_localtime
 rust_timegm