@@ -393,6 +393,20 @@ f.close()

 ## ====== Clean up local destination dir

 test_flushdir("Clean testsuite-out/", "testsuite-out")

+## ====== Move multiple files into directory

+must_find = ["'%s/urandom1.bin' -> '%s/dir/urandom1.bin'" % (pbucket(1),pbucket(1)), "'%s/urandom2.bin' -> '%s/dir/urandom2.bin'" % (pbucket(1),pbucket(1))]

+must_not_find = ["'%s/urandom1.bin' -> '%s/dir'" % (pbucket(1),pbucket(1)), "'%s/urandom2.bin' -> '%s/dir'" % (pbucket(1),pbucket(1))]

+os.system('dd if=/dev/urandom of=testsuite-out/urandom1.bin bs=1k count=1 > /dev/null 2>&1')

+os.system('dd if=/dev/urandom of=testsuite-out/urandom2.bin bs=1k count=1 > /dev/null 2>&1')

+test_s3cmd("Put multiple files", ['put', 'testsuite-out/urandom1.bin', 'testsuite-out/urandom2.bin', '%s/' % pbucket(1)],

+           must_find = ["%s/urandom1.bin" % pbucket(1), "%s/urandom2.bin" % pbucket(1)])

+test_s3cmd("Move multiple files", ['mv', '%s/urandom1.bin' % pbucket(1), '%s/urandom2.bin' % pbucket(1), '%s/dir' % pbucket(1)],

+           must_find = must_find,

+           must_not_find = must_not_find)

+

+## ====== Clean up local destination dir

+test_flushdir("Clean testsuite-out/", "testsuite-out")

+

 ## ====== Sync from S3

 must_find = [ "'%s/xyz/binary/random-crap.md5' -> 'testsuite-out/xyz/binary/random-crap.md5'" % pbucket(1) ]

 if have_encoding:

@@ -400,7 +414,6 @@ if have_encoding:

 test_s3cmd("Sync from S3", ['sync', '%s/xyz' % pbucket(1), 'testsuite-out'],

     must_find = must_find)

-

 ## ====== Remove 'demo' directory

 test_rmdir("Remove 'dir-test/'", "testsuite-out/xyz/dir-test/")

@@ -812,6 +812,8 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

         for key in remote_list:

             remote_list[key]['dest_name'] = destination_base + key

     else:

+        if len(remote_list) > 1 and not destination_base.endswith("/"):

+            destination_base += "/"

         for key in remote_list:

             if destination_base.endswith("/"):

                 remote_list[key]['dest_name'] = destination_base + key