Changeset 93649 in webkit

Timestamp:

Aug 23, 2011 4:07:20 PM (13 years ago)

Author:

Patrick Gansterer

Message:

Fix mergeChangeLogs test on native windows
​https://bugs.webkit.org/show_bug.cgi?id=66797

Reviewed by Adam Roben.

Windows has no /tmp/ directory and the "TMPDIR" environment variable isn't set in the default setup.
Add the "TEMP" environment variable as additional source for the temporary directory used in writeTempFile.

• Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl:

(writeTempFile):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-23  Patrick Gansterer  <paroga@webkit.org>
+
+        Fix mergeChangeLogs test on native windows
+        https://bugs.webkit.org/show_bug.cgi?id=66797
+
+        Reviewed by Adam Roben.
+
+        Windows has no /tmp/ directory and the "TMPDIR" environment variable isn't set in the default setup.
+        Add the "TEMP" environment variable as additional source for the temporary directory used in writeTempFile.
+
+        * Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl:
+        (writeTempFile):
+
 2011-08-23  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

@@ -51 +51 @@
     my ($FH, $fileName) = tempfile(
         $name . "-XXXXXXXX",
-        DIR => ($ENV{'TMPDIR'} || "/tmp"),
+        DIR => ($ENV{'TMPDIR'} || $ENV{'TEMP'} || "/tmp"),
         UNLINK => 0,
     );