commit ec350adb7411888b781a617f094e82d16fae6c51
author Hsin-Yi Chen <hsinyichen@google.com> Fri Jun 15 17:19:38 2018 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 26 23:44:53 2018 +0000
tree 398b573377416dc07215458889525a2539ae8b6c
parent f139b8bba7eb2488cd87f01fe973f802d5f10c92

Fix kernel_net_tests path on Windows

Bug: 110236586
Test: vts-tradefed run vts -m VtsKernelNetTest
Change-Id: Ibed13eb15749128a2794ec68c00fd8d759b17f97
(cherry picked from commit 047b036d4ff95d176c75aba7cd10dfb8eec853a6)

api/net/VtsKernelNetTest.py

diff --git a/api/net/VtsKernelNetTest.py b/api/net/VtsKernelNetTest.py
index 9901573..da0f33d 100644
--- a/api/net/VtsKernelNetTest.py
+++ b/api/net/VtsKernelNetTest.py
@@ -49,13 +49,11 @@
 
         # 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))