dengweijie/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Rejig runner gen

Browse Source
This commit is contained in:
Ed
2024-04-19 10:34:56 +01:00
parent 5f4aa1f7a2
commit 25cd5ffafc
5 changed files with 73 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -51,3 +51,4 @@ host_usb_mixer_control/xmos_mixer
midi_tx_cmds.txt midi_tx_cmds.txt
midi_rx_cmds.txt midi_rx_cmds.txt
trace.txt trace.txt
tests/xua_unit_tests/src.runners

14
tests/xua_unit_tests/CMakeLists.txt
View File

@@ -16,7 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
set(GEN_RUNNER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/generate_unity_runner.py) set(GEN_RUNNER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/generate_unity_runner.py)
# Create directory for runner files # Create directory for runner files
set( RUNNERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/src.runners ) set(RUNNERS_DIR ${CMAKE_CURRENT_LIST_DIR}/src.runners )
file(MAKE_DIRECTORY ${RUNNERS_DIR} ) file(MAKE_DIRECTORY ${RUNNERS_DIR} )
# Find unit test files # Find unit test files
@@ -24,6 +24,8 @@ file( GLOB_RECURSE TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/test_*/*.c )
# For every source file in xua_unit_tests/ # For every source file in xua_unit_tests/
foreach(TESTFILE ${TEST_SOURCES}) foreach(TESTFILE ${TEST_SOURCES})
set(XMOS_SANDBOX_DIR ${CMAKE_CURRENT_LIST_DIR}/../../..)
# Get test name from C file stem # Get test name from C file stem
cmake_path(GET TESTFILE STEM TESTNAME) cmake_path(GET TESTFILE STEM TESTNAME)
project(${TESTNAME}) project(${TESTNAME})
@@ -39,20 +41,19 @@ foreach(TESTFILE ${TEST_SOURCES})
set( GEN_RUNNER_SCRIPT_BYPRODUCTS ${RUNNER_FILE}) set( GEN_RUNNER_SCRIPT_BYPRODUCTS ${RUNNER_FILE})
unset(GEN_RUNNER_SCRIPT_ARGS) unset(GEN_RUNNER_SCRIPT_ARGS)
list(APPEND GEN_RUNNER_SCRIPT_ARGS --project-root ${UNITY_PATH}/..) list(APPEND GEN_RUNNER_SCRIPT_ARGS --project-root ${XMOS_SANDBOX_DIR})
list(APPEND GEN_RUNNER_SCRIPT_ARGS --source-file ${TESTFILE}) list(APPEND GEN_RUNNER_SCRIPT_ARGS --source-file ${TESTFILE})
list(APPEND GEN_RUNNER_SCRIPT_ARGS --runner-file ${RUNNER_FILE}) list(APPEND GEN_RUNNER_SCRIPT_ARGS --runner-file ${RUNNER_FILE})
## Add command to generate runner file ## Add command to generate runner file
add_custom_command( add_custom_command(
OUTPUT ${RUNNER_FILE} OUTPUT ${RUNNER_FILE}
COMMAND ${Python3_EXECUTABLE} ${GEN_RUNNER_SCRIPT} ${GEN_RUNNER_SCRIPT_ARGS} COMMAND python ${GEN_RUNNER_SCRIPT} ${GEN_RUNNER_SCRIPT_ARGS}
COMMENT "Generating XUA Unit Test Runner" ) COMMENT "Generate XUA Unit Test Runner" )
########################## ##########################
## Do xcommon cmake build ## Do xcommon cmake build
########################## ##########################
set(XMOS_SANDBOX_DIR ${CMAKE_CURRENT_LIST_DIR}/../../..)
set(APP_HW_TARGET XK-EVK-XU316) set(APP_HW_TARGET XK-EVK-XU316)
set(APP_DEPENDENT_MODULES "lib_xua") set(APP_DEPENDENT_MODULES "lib_xua")
# set(APP_PCA_ENABLE ON) # set(APP_PCA_ENABLE ON)
@@ -77,8 +78,9 @@ foreach(TESTFILE ${TEST_SOURCES})
# Workaround for xcommon cmake pre-pending CMAKE_CURRENT_LIST_DIR # Workaround for xcommon cmake pre-pending CMAKE_CURRENT_LIST_DIR
string(REPLACE ${CMAKE_CURRENT_LIST_DIR} "" UNIT_TEST_SOURCE_RELATIVE ${TESTFILE}) string(REPLACE ${CMAKE_CURRENT_LIST_DIR} "" UNIT_TEST_SOURCE_RELATIVE ${TESTFILE})
string(REPLACE ${CMAKE_CURRENT_LIST_DIR} "" RUNNER_FILE_RELATIVE ${RUNNER_FILE})
set(APP_C_SRCS runners/${TESTNAME}/${TESTNAME}_Runner.c set(APP_C_SRCS ${RUNNER_FILE_RELATIVE}
${UNIT_TEST_SOURCE_RELATIVE} ${UNIT_TEST_SOURCE_RELATIVE}
../../../Unity/src/unity.c ../../../Unity/src/unity.c
) )

4
tests/xua_unit_tests/conftest.py
View File

@@ -1,4 +1,4 @@
# Copyright 2021-2022 XMOS LIMITED. # Copyright 2021-2024 XMOS LIMITED.
# This Software is subject to the terms of the XMOS Public Licence: Version 1. # This Software is subject to the terms of the XMOS Public Licence: Version 1.
from __future__ import print_function from __future__ import print_function
from builtins import str from builtins import str
@@ -28,7 +28,7 @@ class UnityTestSource(pytest.File):
# unit_tests/ <- Test root directory # unit_tests/ <- Test root directory
# |-- bin/ <- Compiled binaries of the test runners # |-- bin/ <- Compiled binaries of the test runners
# |-- conftest.py <- This file # |-- conftest.py <- This file
# |-- runners/ <- Auto-generated buildable source of test binaries # |-- src.runners <- Auto-generated buildable source of test binaries
# |-- src/ <- Unity test functions # |-- src/ <- Unity test functions
# `-- wscript <- Build system file used to generate/build runners # `-- wscript <- Build system file used to generate/build runners
xe_name = ((os.path.basename(self.name)).split("."))[0] + ".xe" xe_name = ((os.path.basename(self.name)).split("."))[0] + ".xe"

59
tests/xua_unit_tests/generate_unity_runner.py Executable file
View File

@@ -0,0 +1,59 @@
# Copyright 2024 XMOS LIMITED.
# This Software is subject to the terms of the XMOS Public Licence: Version 1.
import glob
import os.path
import subprocess
import sys
import argparse
def parse_arguments():
parser = argparse.ArgumentParser()
parser.add_argument("--project-root", nargs='?', help="Project root directory")
parser.add_argument("--source-file", nargs='?', help="source file.")
parser.add_argument("--runner-file", nargs='?', help="runner file.")
args = parser.parse_args()
return args
def get_ruby():
"""
Check ruby is avaliable and return the command to invoke it.
"""
interpreter_name = 'ruby'
try:
dev_null = open(os.devnull, 'w')
# Call the version command to check the interpreter can be run
subprocess.check_call([interpreter_name, '--version'],
stdout=dev_null,
close_fds=True)
except OSError as e:
print("Failed to run Ruby interpreter: {}".format(e), file=sys.stderr)
exit(1) # TODO: Check this is the correct way to kill xwaf on error
return interpreter_name
def get_unity_runner_generator(project_root_path):
"""
Check the Unity generate_test_runner script is avaliable, and return the
path to it.
"""
unity_runner_generator = os.path.join(
project_root_path, 'Unity', 'auto', 'generate_test_runner.rb')
if not os.path.exists(unity_runner_generator):
print("Unity repo not found in workspace", file=sys.stderr)
exit(1) # TODO: Check this is the correct way to kill xwaf on error
return unity_runner_generator
if __name__ == "__main__":
args = parse_arguments()
print(f"in python: root {args.project_root}, source {args.source_file}, runner {args.runner_file}")
try:
subprocess.check_call([get_ruby(),
get_unity_runner_generator(args.project_root),
args.source_file,
args.runner_file])
except OSError as e:
print("Ruby generator failed for {}\n\t{}".format(unity_test_path, e),
file=sys.stderr)
exit(1) # TODO: Check this is the correct way to kill xwaf on error

134
tests/xua_unit_tests/generate_unity_runners.py
View File

@@ -1,134 +0,0 @@
# Copyright 2021-2022 XMOS LIMITED.
# This Software is subject to the terms of the XMOS Public Licence: Version 1.
import glob
import os.path
import subprocess
import sys
UNITY_TEST_DIR = "src"
UNITY_TEST_PREFIX = "test_"
UNITY_RUNNER_DIR = "runners"
UNITY_RUNNER_SUFFIX = "_Runner"
project_root = os.path.join("..", "..", "..")
def get_ruby():
"""
Check ruby is avaliable and return the command to invoke it.
"""
interpreter_name = "ruby"
try:
dev_null = open(os.devnull, "w")
# Call the version command to check the interpreter can be run
subprocess.check_call(
[interpreter_name, "--version"], stdout=dev_null, close_fds=True
)
except OSError as e:
print("Failed to run Ruby interpreter: {}".format(e), file=sys.stderr)
exit(1) # TODO: Check this is the correct way to kill xwaf on error
return interpreter_name
def get_unity_runner_generator(project_root_path):
"""
Check the Unity generate_test_runner script is avaliable, and return the
path to it.
"""
unity_runner_generator = os.path.join(
project_root_path, "Unity", "auto", "generate_test_runner.rb"
)
if not os.path.exists(unity_runner_generator):
print("Unity repo not found in workspace", file=sys.stderr)
exit(1) # TODO: Check this is the correct way to kill xwaf on error
return unity_runner_generator
def get_test_name(test_path):
"""
Return the test name by removing the extension from the filename.
"""
return os.path.splitext(os.path.basename(test_path))[0]
def get_file_type(filename):
"""
Return the extension from the filename.
"""
return filename.rsplit(".")[-1:][0]
def generate_unity_runner(
project_root_path, unity_test_path, unity_runner_dir, unity_runner_suffix
):
"""
Invoke the Unity runner generation script for the given test file, and
return the path to the generated file. The output directory will be created
if it does not already exist.
"""
runner_path = os.path.join(
os.path.join(unity_runner_dir, get_test_name(unity_test_path))
)
if not os.path.exists(runner_path):
os.makedirs(runner_path)
unity_runner_path = os.path.join(
runner_path, get_test_name(unity_test_path) + unity_runner_suffix + "." + "c"
)
try:
subprocess.check_call(
[
get_ruby(),
get_unity_runner_generator(project_root_path),
unity_test_path,
unity_runner_path,
]
)
except OSError as e:
print(
"Ruby generator failed for {}\n\t{}".format(unity_test_path, e),
file=sys.stderr,
)
exit(1) # TODO: Check this is the correct way to kill xwaf on error
def find_unity_test_paths(unity_test_dir, unity_test_prefix):
"""
Return a list of all file paths with the unity_test_prefix found in the
unity_test_dir.
"""
return glob.glob(os.path.join(unity_test_dir, unity_test_prefix + "*"))
def find_unity_tests(unity_test_dir, unity_test_prefix):
"""
Return a dictionary of all {test names, test language} pairs with the
unity_test_prefix found in the unity_test_dir.
"""
unity_test_paths = find_unity_test_paths(unity_test_dir, unity_test_prefix)
print("unity_test_paths = ", unity_test_paths)
return {get_test_name(path): get_file_type(path) for path in unity_test_paths}
def find_unity_test_paths(unity_test_dir, unity_test_prefix):
"""
Return a list of all file paths with the unity_test_prefix found in the
unity_test_dir.
"""
return glob.glob(os.path.join(unity_test_dir, unity_test_prefix + "*"))
def generate_runners():
UNITY_TESTS = find_unity_tests(UNITY_TEST_DIR, UNITY_TEST_PREFIX)
print("UNITY_TESTS = ", UNITY_TESTS)
unity_test_paths = find_unity_test_paths(UNITY_TEST_DIR, UNITY_TEST_PREFIX)
print("unity_test_paths = ", unity_test_paths)
for unity_test_path in unity_test_paths:
generate_unity_runner(
project_root, unity_test_path, UNITY_RUNNER_DIR, UNITY_RUNNER_SUFFIX
)
if __name__ == "__main__":
generate_runners()