Merge pull request #152 from brownleej/system-time-zone-fix

Fixes a shadowed variable in the system time zone initializer.

Author: phausler

CoreFoundation/NumberDate.subproj/CFTimeZone.c

@@ -753,7 +753,6 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
     }
     ret = readlink(TZZONELINK, linkbuf, sizeof(linkbuf));
     if (0 < ret) {
-        CFStringRef name;
         linkbuf[ret] = '\0';
         if (strncmp(linkbuf, TZZONEINFO, sizeof(TZZONEINFO) - 1) == 0) {
             name = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (uint8_t *)linkbuf + sizeof(TZZONEINFO) - 1, strlen(linkbuf) - sizeof(TZZONEINFO) + 1, kCFStringEncodingUTF8, false);

TestFoundation/TestNSTimeZone.swift

@@ -12,9 +12,11 @@
 #if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
     import Foundation
     import XCTest
+    import Glibc
 #else
     import SwiftFoundation
     import SwiftXCTest
+    import Darwin
 #endif
 
 
@@ -25,6 +27,7 @@ class TestNSTimeZone: XCTestCase {
         return [
             ("test_abbreviation", test_abbreviation),
             ("test_initializingTimeZoneWithOffset", test_initializingTimeZoneWithOffset),
+            ("test_systemTimeZoneUsesSystemTime", test_systemTimeZoneUsesSystemTime),
         ]
     }
 
@@ -39,4 +42,14 @@ class TestNSTimeZone: XCTestCase {
         let seconds = tz?.secondsFromGMTForDate(NSDate())
         XCTAssertEqual(seconds, -14400)
     }
+    
+    func test_systemTimeZoneUsesSystemTime() {
+        tzset();
+        var t = time(nil)
+        var lt = tm()
+        localtime_r(&t, &lt)
+        let zoneName = NSTimeZone.systemTimeZone().abbreviation ?? "Invalid Abbreviation"
+        let expectedName = NSString(CString: lt.tm_zone, encoding: NSASCIIStringEncoding)?.bridge() ?? "Invalid Zone"
+        XCTAssertEqual(zoneName, expectedName)
+    }
 }