Changeset 83310 in webkit

Timestamp:

Apr 8, 2011 10:43:13 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-08 Pere Martir <​pere.martir4@gmail.com>

Reviewed by Adam Roben.

Locate NSTD.EXE in 64-bit Windows
​https://bugs.webkit.org/show_bug.cgi?id=57847

• Scripts/old-run-webkit-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-08  Pere Martir  <pere.martir4@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        Locate NSTD.EXE in 64-bit Windows
+        https://bugs.webkit.org/show_bug.cgi?id=57847
+
+        * Scripts/old-run-webkit-tests:
+
 2011-04-08  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -2684 +2684 @@
     my $ntsdPath = File::Spec->catfile(toCygwinPath($ENV{PROGRAMFILES}), "Debugging Tools for Windows (x86)", "ntsd.exe");
     unless (-f $ntsdPath) {
-        $ntsdPath = File::Spec->catfile(toCygwinPath($ENV{SYSTEMROOT}), "system32", "ntsd.exe");
+        $ntsdPath = File::Spec->catfile(toCygwinPath($ENV{ProgramW6432}), "Debugging Tools for Windows (x64)", "ntsd.exe");
         unless (-f $ntsdPath) {
-            print STDERR "Can't find ntsd.exe. Crash logs will not be saved.\nSee <http://trac.webkit.org/wiki/BuildingOnWindows#GettingCrashLogs>.\n";
-            return;
+            $ntsdPath = File::Spec->catfile(toCygwinPath($ENV{SYSTEMROOT}), "system32", "ntsd.exe");
+            unless (-f $ntsdPath) {
+                print STDERR "Can't find ntsd.exe. Crash logs will not be saved.\nSee <http://trac.webkit.org/wiki/BuildingOnWindows#GettingCrashLogs>.\n";
+                return;
+            }
         }
     }