Use python executable to drive upload script
On windows we can't just call the gsutil.py script directly
R=sgjesse@google.com
Bug:
Change-Id: Ic46685574f3f3df705f9226d7fde9c378d10c3a7
diff --git a/tools/test.py b/tools/test.py
index 68fa829..ba459e7 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -112,7 +112,7 @@
return_code = gradle.RunGradle(gradle_args + ['-Pdex_vm=%s' % art_vm],
throw_on_failure=False)
if return_code != 0:
- if options.archive_failures and os.name != 'nt':
+ if options.archive_failures:
archive_failures()
return return_code
diff --git a/tools/utils.py b/tools/utils.py
index dab1dd1..b7abb45 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -56,7 +56,7 @@
def upload_html_to_cloud_storage(directory, destination):
# Upload and make the content encoding right for viewing directly
- cmd = ['gsutil.py', 'cp', '-z', 'html', '-a',
+ cmd = [sys.executable, 'gsutil.py', 'cp', '-z', 'html', '-a',
'public-read', '-R', directory, destination]
PrintCmd(cmd)
subprocess.check_call(cmd)
