diff options
Diffstat (limited to 'meta/lib/oeqa/utils/testexport.py')
| -rw-r--r-- | meta/lib/oeqa/utils/testexport.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/utils/testexport.py b/meta/lib/oeqa/utils/testexport.py index e89d130a9c..3ab024d9e9 100644 --- a/meta/lib/oeqa/utils/testexport.py +++ b/meta/lib/oeqa/utils/testexport.py | |||
| @@ -60,17 +60,17 @@ def process_binaries(d, params): | |||
| 60 | export_env = d.getVar("TEST_EXPORT_ONLY") | 60 | export_env = d.getVar("TEST_EXPORT_ONLY") |
| 61 | 61 | ||
| 62 | def extract_binary(pth_to_pkg, dest_pth=None): | 62 | def extract_binary(pth_to_pkg, dest_pth=None): |
| 63 | cpio_command = runCmd("which cpio") | 63 | tar_command = runCmd("which tar") |
| 64 | rpm2cpio_command = runCmd("ls /usr/bin/rpm2cpio") | 64 | rpm2archive_command = runCmd("ls /usr/bin/rpm2archive") |
| 65 | if (cpio_command.status != 0) and (rpm2cpio_command.status != 0): | 65 | if (tar_command.status != 0) and (rpm2archive_command.status != 0): |
| 66 | bb.fatal("Either \"rpm2cpio\" or \"cpio\" tools are not available on your system." | 66 | bb.fatal("Either \"rpm2archive\" or \"tar\" tools are not available on your system." |
| 67 | "All binaries extraction processes will not be available, crashing all related tests." | 67 | "All binaries extraction processes will not be available, crashing all related tests." |
| 68 | "Please install them according to your OS recommendations") # will exit here | 68 | "Please install them according to your OS recommendations") # will exit here |
| 69 | if dest_pth: | 69 | if dest_pth: |
| 70 | os.chdir(dest_pth) | 70 | os.chdir(dest_pth) |
| 71 | else: | 71 | else: |
| 72 | os.chdir("%s" % os.sep)# this is for native package | 72 | os.chdir("%s" % os.sep)# this is for native package |
| 73 | extract_bin_command = runCmd("%s %s | %s -idm" % (rpm2cpio_command.output, pth_to_pkg, cpio_command.output)) # semi-hardcoded because of a bug on poky's rpm2cpio | 73 | extract_bin_command = runCmd("%s -n %s | %s xv" % (rpm2archive_command.output, pth_to_pkg, tar_command.output)) # semi-hardcoded because of a bug on poky's rpm2cpio |
| 74 | return extract_bin_command | 74 | return extract_bin_command |
| 75 | 75 | ||
| 76 | if determine_if_poky_env(): # machine with poky environment | 76 | if determine_if_poky_env(): # machine with poky environment |