testbot/TestAgent: Use the basename of the first filename if the second one is omitted for getfile or sendfile.

Francois Gouget fgouget at codeweavers.com
Mon Feb 25 09:59:25 CST 2013


---

This just makes the TestAgent tool more user friendly.

 testbot/scripts/TestAgent |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent
index a9c2029..d25a3d6 100755
--- a/testbot/scripts/TestAgent
+++ b/testbot/scripts/TestAgent
@@ -128,13 +128,35 @@ while (@ARGV)
     {
         $Cmd = $arg;
         $LocalFilename = check_opt_val($arg, $LocalFilename);
-        $ServerFilename = check_opt_val($arg, $ServerFilename) if (!$Usage);
+        if (!$Usage)
+        {
+            if (@ARGV)
+            {
+                $ServerFilename = check_opt_val($arg, $ServerFilename);
+            }
+            else
+            {
+                $ServerFilename = $LocalFilename;
+                $ServerFilename =~ s%^.*/%%;
+            }
+        }
     }
     elsif ($arg eq "getfile")
     {
         $Cmd = $arg;
         $ServerFilename = check_opt_val($arg, $ServerFilename);
-        $LocalFilename = check_opt_val($arg, $LocalFilename) if (!$Usage);
+        if (!$Usage)
+        {
+            if (@ARGV)
+            {
+                $LocalFilename = check_opt_val($arg, $LocalFilename);
+            }
+            else
+            {
+                $LocalFilename = $ServerFilename;
+                $LocalFilename =~ s%^.*[/\\]%%;
+            }
+        }
     }
     elsif ($arg eq "run")
     {
-- 
1.7.10.4




More information about the wine-patches mailing list