diff --git a/examples/system/app_trace_to_host/example_test.py b/examples/system/app_trace_to_host/example_test.py index de58da3b6c..ed2e1bda4d 100644 --- a/examples/system/app_trace_to_host/example_test.py +++ b/examples/system/app_trace_to_host/example_test.py @@ -6,7 +6,6 @@ import ttfw_idf @ttfw_idf.idf_example_test(env_tag="test_jtag_arm") def test_examples_app_trace_to_host(env, extra_data): - rel_project_path = os.path.join('examples', 'system', 'app_trace_to_host') dut = env.get_dut('app_trace_to_host', rel_project_path) idf_path = dut.app.get_sdk_path() @@ -28,8 +27,7 @@ def test_examples_app_trace_to_host(env, extra_data): with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/logtrace_proc.py'), 'adc.log', - os.path.join(dut.app.get_binary_path(rel_project_path), - 'app_trace_to_host.elf')]), + os.path.join(dut.app.binary_path, 'app_trace_to_host.elf')]), logfile='logtrace_proc.log') as logtrace: logtrace.pexpect_proc.expect_exact('Parse trace file') logtrace.pexpect_proc.expect_exact('Parsing completed.') diff --git a/examples/system/sysview_tracing/example_test.py b/examples/system/sysview_tracing/example_test.py index 264b080715..666fd4a46e 100644 --- a/examples/system/sysview_tracing/example_test.py +++ b/examples/system/sysview_tracing/example_test.py @@ -13,9 +13,8 @@ def test_examples_sysview_tracing(env, extra_data): rel_project_path = os.path.join('examples', 'system', 'sysview_tracing') dut = env.get_dut('sysview_tracing', rel_project_path) - idf_path = dut.app.get_sdk_path() - proj_path = os.path.join(idf_path, rel_project_path) - elf_path = os.path.join(dut.app.get_binary_path(rel_project_path), 'sysview_tracing.elf') + proj_path = os.path.join(dut.app.idf_path, rel_project_path) + elf_path = os.path.join(dut.app.binary_path, 'sysview_tracing.elf') def get_temp_file(): with tempfile.NamedTemporaryFile(delete=False) as f: diff --git a/examples/system/sysview_tracing_heap_log/example_test.py b/examples/system/sysview_tracing_heap_log/example_test.py index 2f55724789..1740025a43 100644 --- a/examples/system/sysview_tracing_heap_log/example_test.py +++ b/examples/system/sysview_tracing_heap_log/example_test.py @@ -12,9 +12,8 @@ def test_examples_sysview_tracing_heap_log(env, extra_data): rel_project_path = os.path.join('examples', 'system', 'sysview_tracing_heap_log') dut = env.get_dut('sysview_tracing_heap_log', rel_project_path) - idf_path = dut.app.get_sdk_path() - proj_path = os.path.join(idf_path, rel_project_path) - elf_path = os.path.join(dut.app.get_binary_path(rel_project_path), 'sysview_tracing_heap_log.elf') + proj_path = os.path.join(dut.app.idf_path, rel_project_path) + elf_path = os.path.join(dut.app.binary_path, 'sysview_tracing_heap_log.elf') def get_temp_file(): with tempfile.NamedTemporaryFile(delete=False) as f: @@ -45,7 +44,7 @@ def test_examples_sysview_tracing_heap_log(env, extra_data): # dut has been restarted by gdb since the last dut.expect() dut.expect('esp_apptrace: Initialized TRAX on CPU0') - with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/sysviewtrace_proc.py'), + with ttfw_idf.CustomProcess(' '.join([os.path.join(dut.app.idf_path, 'tools/esp_app_trace/sysviewtrace_proc.py'), '-p', '-b', elf_path, tempfiles[1]]), diff --git a/tools/test_apps/system/monitor_ide_integration/app_test.py b/tools/test_apps/system/monitor_ide_integration/app_test.py index adbd974dce..e617ffb132 100644 --- a/tools/test_apps/system/monitor_ide_integration/app_test.py +++ b/tools/test_apps/system/monitor_ide_integration/app_test.py @@ -65,8 +65,8 @@ def test_monitor_ide_integration(env, extra_data): for name in config_names: Utility.console_log('Checking config "{}"... '.format(name), 'green', end='') dut = env.get_dut('panic', rel_proj_path, app_config_name=name) - monitor_path = os.path.join(dut.app.get_sdk_path(), 'tools/idf_monitor.py') - elf_path = os.path.join(dut.app.get_binary_path(rel_proj_path), 'panic.elf') + monitor_path = os.path.join(dut.app.idf_path, 'tools/idf_monitor.py') + elf_path = os.path.join(dut.app.binary_path, 'panic.elf') dut.start_app() # Closing the DUT because we will reconnect with IDF Monitor env.close_dut(dut.name)