diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt --- a/src/bench/CMakeLists.txt +++ b/src/bench/CMakeLists.txt @@ -9,7 +9,7 @@ # Process raw files. file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/data") -find_program(PYTHON python) +find_program(PYTHON python3) foreach(_raw_file ${BENCH_DATA_RAW_FILES}) string(APPEND _generated_header_output diff --git a/src/bench/data/convert-raw-to-header.py b/src/bench/data/convert-raw-to-header.py --- a/src/bench/data/convert-raw-to-header.py +++ b/src/bench/data/convert-raw-to-header.py @@ -9,7 +9,7 @@ contents = f.read() print("static unsigned const char {}[] = {{".format(test_name)) - print(", ".join(map(lambda x: "0x{:02x}".format(ord(x)), contents))) + print(", ".join(map(lambda x: "0x{:02x}".format(x), contents))) print("};") diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -5,7 +5,7 @@ # Process json files. file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/data") -find_program(PYTHON python) +find_program(PYTHON python3) function(gen_json_header NAME) set(HEADERS "") foreach(f ${ARGN}) diff --git a/src/test/data/generate_header.py b/src/test/data/generate_header.py --- a/src/test/data/generate_header.py +++ b/src/test/data/generate_header.py @@ -11,7 +11,7 @@ print("#include \n") print("namespace json_tests {") print("static const uint8_t {}[] = {{".format(test_name)) - print(", ".join(map(lambda x: "0x{:02x}".format(ord(x)), contents))) + print(", ".join(map(lambda x: "0x{:02x}".format(x), contents))) print("};") print("};")