diff --git a/clangformat.py b/clangformat.py index 5838a7df7..3090e7a91 100644 --- a/clangformat.py +++ b/clangformat.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- # run clang format over all files # @@ -56,4 +57,5 @@ def main( ): return # call the entry point -main( ) +if __name__ == "__main__": + main() diff --git a/run_conformance_tests.py b/run_conformance_tests.py index d7ec8b0ac..71bdb454f 100644 --- a/run_conformance_tests.py +++ b/run_conformance_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import os import subprocess import sys @@ -104,6 +105,7 @@ def generate_cmake_call(cmake_exe, build_system_name, conformance_filter, Generates a CMake call based on the input in a form accepted by subprocess.call(). """ + import shlex return [ cmake_exe, '..', @@ -113,7 +115,7 @@ def generate_cmake_call(cmake_exe, build_system_name, conformance_filter, '-Dhost_device_name=' + host_names[1], '-Dopencl_platform_name=' + opencl_names[0], '-Dopencl_device_name=' + opencl_names[1], - ] + additional_cmake_args.split() + ] + shlex.split(additional_cmake_args) def subprocess_call(parameter_list): @@ -290,7 +292,7 @@ def update_xml_attribs(host_info_json, opencl_info_json, implementation_name, return test_xml_root -def main(argv=sys.argv): +def main(argv=sys.argv[1:]): # Parse and gather all the script args (cmake_exe, build_system_name, build_system_call, conformance_filter, @@ -332,7 +334,7 @@ def main(argv=sys.argv): result_xml_root.append(stylesheet_xml_root[0]) # Get the xml results as a string and append them to the report header. - report = REPORT_HEADER + ET.tostring(result_xml_root) + report = REPORT_HEADER + ET.tostring(result_xml_root).decode("utf-8") with open("conformance_report.xml", 'w') as final_conformance_report: final_conformance_report.write(report) diff --git a/runtests.py b/runtests.py index b6868f0cc..f81205cd5 100644 --- a/runtests.py +++ b/runtests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 ################################################################################ ## ## SYCL 1.2.1 Conformance Test Suite diff --git a/tests/math_builtin_api/generate_math_builtin.py b/tests/math_builtin_api/generate_math_builtin.py index ecaad8236..a40fec945 100644 --- a/tests/math_builtin_api/generate_math_builtin.py +++ b/tests/math_builtin_api/generate_math_builtin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 ################################################################################ ## ## SYCL 1.2.1 Conformance Test Suite diff --git a/tests/vector_alias/generate_vector_alias.py b/tests/vector_alias/generate_vector_alias.py index d5e9c9789..b6a2c56b8 100644 --- a/tests/vector_alias/generate_vector_alias.py +++ b/tests/vector_alias/generate_vector_alias.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_api/generate_vector_api.py b/tests/vector_api/generate_vector_api.py index eaa30c50e..511847d79 100644 --- a/tests/vector_api/generate_vector_api.py +++ b/tests/vector_api/generate_vector_api.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_constructors/generate_vector_constructors.py b/tests/vector_constructors/generate_vector_constructors.py index ee5177a73..f1aa04cd7 100644 --- a/tests/vector_constructors/generate_vector_constructors.py +++ b/tests/vector_constructors/generate_vector_constructors.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_load_store/generate_vector_load_store.py b/tests/vector_load_store/generate_vector_load_store.py index 1080653fa..9b702a3cf 100644 --- a/tests/vector_load_store/generate_vector_load_store.py +++ b/tests/vector_load_store/generate_vector_load_store.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_operators/generate_vector_operators.py b/tests/vector_operators/generate_vector_operators.py index 191efe8dc..31ba598c0 100644 --- a/tests/vector_operators/generate_vector_operators.py +++ b/tests/vector_operators/generate_vector_operators.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_swizzle_assignment/generate_vector_swizzle_assignment.py b/tests/vector_swizzle_assignment/generate_vector_swizzle_assignment.py index 2d292f7be..707b355a4 100644 --- a/tests/vector_swizzle_assignment/generate_vector_swizzle_assignment.py +++ b/tests/vector_swizzle_assignment/generate_vector_swizzle_assignment.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_swizzles/generate_vector_swizzles.py b/tests/vector_swizzles/generate_vector_swizzles.py index 48c35c8c4..b9a83eb59 100644 --- a/tests/vector_swizzles/generate_vector_swizzles.py +++ b/tests/vector_swizzles/generate_vector_swizzles.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite diff --git a/tests/vector_swizzles_opencl/generate_vector_swizzles_opencl.py b/tests/vector_swizzles_opencl/generate_vector_swizzles_opencl.py index 624cd33cf..a64793571 100644 --- a/tests/vector_swizzles_opencl/generate_vector_swizzles_opencl.py +++ b/tests/vector_swizzles_opencl/generate_vector_swizzles_opencl.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ************************************************************************ # # SYCL Conformance Test Suite