diff options
| -rwxr-xr-x | buildbot_test_toolchains.py | 15 | ||||
| -rwxr-xr-x | test_toolchains.py | 9 |
2 files changed, 14 insertions, 10 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index d3b23003..3254c93d 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -166,11 +166,12 @@ class ToolchainComparator(): else: test_path = vanilla_image tar_file_name = "%s_%s_image.tar" % (self._weekday, label_name) - cmd = "cd %s; tar -cvf %s %s/*; cp %s %s/." % (images_path, - tar_file_name, - test_path, - tar_file_name, - dest_dir) + cmd = ("cd %s; tar -cvf %s %s/chromiumos_test_image.bin; " + "cp %s %s/.") % (images_path, + tar_file_name, + test_path, + tar_file_name, + dest_dir) if dry_run: print "CMD: %s" % cmd tar_ret = 0 @@ -189,7 +190,9 @@ class ToolchainComparator(): crosperf, and copy images into seven-day report directories. """ date_str = datetime.date.today() - description = "master_%s_%s_%s" % (USE_NEXT_GCC_PATCH, self._build, date_str) + description = "master_%s_%s_%s" % (USE_NEXT_GCC_PATCH, + self._build, + date_str) trybot_image = buildbot_utils.GetTrybotImage(self._chromeos_root, self._build, [ USE_NEXT_GCC_PATCH ], diff --git a/test_toolchains.py b/test_toolchains.py index 578312e2..58629c47 100755 --- a/test_toolchains.py +++ b/test_toolchains.py @@ -264,10 +264,11 @@ class ToolchainComparator(ChromeOSCheckout): else: label_name = "vanilla" tar_file_name = "%s_%s_image.tar" % (weekday, label_name) - cmd = "cd %s; tar -cvf %s %s/*; cp %s %s/." % (images_path, - tar_file_name, - l, tar_file_name, - dest_dir) + cmd = ("cd %s; tar -cvf %s %s/chromiumos_test_image.bin; " + "cp %s %s/.") % (images_path, + tar_file_name, + l, tar_file_name, + dest_dir) tar_ret = self._ce.RunCommand(cmd) if tar_ret: self._l.LogOutput("Error while creating/copying test tar file(%s)." |