diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2018-06-15 17:19:38 +0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-26 23:44:53 +0000 |
| commit | ec350adb7411888b781a617f094e82d16fae6c51 (patch) | |
| tree | 398b573377416dc07215458889525a2539ae8b6c | |
| parent | f139b8bba7eb2488cd87f01fe973f802d5f10c92 (diff) | |
| download | platform_test_vts-testcase_kernel-pie-security-release.tar.gz platform_test_vts-testcase_kernel-pie-security-release.tar.bz2 platform_test_vts-testcase_kernel-pie-security-release.zip | |
Fix kernel_net_tests path on Windowsandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
Bug: 110236586
Test: vts-tradefed run vts -m VtsKernelNetTest
Change-Id: Ibed13eb15749128a2794ec68c00fd8d759b17f97
(cherry picked from commit 047b036d4ff95d176c75aba7cd10dfb8eec853a6)
| -rw-r--r-- | api/net/VtsKernelNetTest.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/api/net/VtsKernelNetTest.py b/api/net/VtsKernelNetTest.py index 9901573a..da0f33d0 100644 --- a/api/net/VtsKernelNetTest.py +++ b/api/net/VtsKernelNetTest.py @@ -49,13 +49,11 @@ class VtsKernelNetTest(base_test.BaseTestClass): # 32-bit version of the test should only run against 32-bit kernel; # same for 64 bit. - bin_path = os.path.join( - 'nativetest64' if self.dut.is64Bit else 'nativetest', - 'kernel_net_tests', - 'kernel_net_tests') + bin_path = ('nativetest64' if self.dut.is64Bit else 'nativetest', + 'kernel_net_tests', 'kernel_net_tests') - self.host_bin_path = os.path.join(self.data_file_path, 'DATA', bin_path) - self.target_bin_path = path_utils.JoinTargetPath('data', bin_path) + self.host_bin_path = os.path.join(self.data_file_path, 'DATA', *bin_path) + self.target_bin_path = path_utils.JoinTargetPath('data', *bin_path) def tearDownClass(self): self.shell('rm -rf %s' % path_utils.TargetDirName(self.target_bin_path)) |