diff options
| author | Matthew Crymble <matthew.crymble@ni.com> | 2021-02-03 11:02:47 -0600 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-02-08 15:27:16 -0600 |
| commit | 50e6357b55cd100e78aaa140064f82345a2d37e0 (patch) | |
| tree | 6e0b87ce0a261f1a321107efacf953da41d3db34 | |
| parent | fbb0b0998992306375d179fb4fd0d25385689112 (diff) | |
| download | uhd-50e6357b55cd100e78aaa140064f82345a2d37e0.tar.gz uhd-50e6357b55cd100e78aaa140064f82345a2d37e0.tar.bz2 uhd-50e6357b55cd100e78aaa140064f82345a2d37e0.zip | |
Revert "devtest: allow extra device arguments when running devtests"
This reverts commit 7b86a47bf7143df1cac252602e3c9ddbdd871d90.
This was causing issues when building UHD with ninja
| -rw-r--r-- | host/tests/devtest/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | host/tests/devtest/run_testsuite.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/host/tests/devtest/CMakeLists.txt b/host/tests/devtest/CMakeLists.txt index a8a7f51ef..429d1a731 100644 --- a/host/tests/devtest/CMakeLists.txt +++ b/host/tests/devtest/CMakeLists.txt @@ -26,7 +26,7 @@ macro(ADD_DEVTEST pattern filter devtype) ${RUNTIME_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/run_testsuite.py "--src-dir" "${CMAKE_CURRENT_SOURCE_DIR}" "--devtest-pattern" "${pattern}" - "--args" "$(EXTRA_DEV_ARGS),type=${filter}" + "--args" "type=${filter}" "--build-type" "${CMAKE_BUILD_TYPE}" "--build-dir" "${CMAKE_BINARY_DIR}" "--python-interp" "${RUNTIME_PYTHON_EXECUTABLE}" diff --git a/host/tests/devtest/run_testsuite.py b/host/tests/devtest/run_testsuite.py index 4e45b112e..a5ece8ac6 100755 --- a/host/tests/devtest/run_testsuite.py +++ b/host/tests/devtest/run_testsuite.py @@ -90,7 +90,6 @@ def main(): env = setup_env(args) devtest_pattern = "devtest_{p}.py".format(p=args.devtest_pattern) uhd_args_list = get_usrp_list(args.args, env) - arg_dict = dict(arg.split('=') for arg in args.args.strip(',').split(',')) if len(uhd_args_list) == 0: print("No devices found. Exiting.") exit(1) @@ -104,15 +103,13 @@ def main(): print('--- This will take some time. Better grab a cup of tea.') sys.stdout.flush() args_str = uhd_info['args'] + env['_UHD_TEST_ARGS_STR'] = args_str logfile_name = "log{}.log".format( args_str.replace('type=', '_').replace('serial=', '_').replace(',', '') ) resultsfile_name = "results{}.log".format( args_str.replace('type=', '_').replace('serial=', '_').replace(',', '') ) - if 'addr' in arg_dict: - args_str += ',addr={}'.format(arg_dict['addr']) - env['_UHD_TEST_ARGS_STR'] = args_str env['_UHD_TEST_LOGFILE'] = os.path.join(args.log_dir, logfile_name) env['_UHD_TEST_RESULTSFILE'] = os.path.join(args.log_dir, resultsfile_name) env['_UHD_TEST_LOG_LEVEL'] = str(logging.INFO) |