From 41a5b57b6e9274f9c63545fbc0ea1dd146781f56 Mon Sep 17 00:00:00 2001
From: "pschwartau%netscape.com"
 <pschwartau%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 12 Oct 2002 02:08:02 +0000
Subject: [PATCH] Use -x &xp_path() more consistently.

git-svn-id: svn://10.0.0.236/trunk@131862 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/tests/jsDriver.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mozilla/js/tests/jsDriver.pl b/mozilla/js/tests/jsDriver.pl
index 3cfe634d56e..73c27ea77d8 100755
--- a/mozilla/js/tests/jsDriver.pl
+++ b/mozilla/js/tests/jsDriver.pl
@@ -606,6 +606,11 @@ sub get_xpc_engine_command {
         $m5_home .= "/";
     }
 
+    if (($os_type ne "MAC") && !(-x &xp_path($m5_home . "xpcshell"))) {
+        # mac doesn't seem to deal with -x correctly
+        die (&xp_path($m5_home . "xpcshell") . " is not a valid executable on this system.\n");
+    }
+
     return &xp_path($m5_home . "xpcshell");
 
 }
@@ -739,7 +744,7 @@ sub get_dd_engine_command {
         }
 
 
-        if (($os_type ne "MAC") && !(-x $retval)) {
+        if (($os_type ne "MAC") && !(-x &xp_path($retval))) {
             # mac doesn't seem to deal with -x correctly
             die ($retval . " is not a valid executable on this system.\n");
         }