mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-05 13:44:32 +02:00
tools: fix double builds with idf.py
This commit is contained in:
@@ -111,6 +111,7 @@ def action_extensions(base_actions, project_path):
|
||||
run_tool("idf_monitor", monitor_args, args.project_dir)
|
||||
|
||||
def flash(action, ctx, args):
|
||||
ensure_build_directory(args, ctx.info_name)
|
||||
"""
|
||||
Run esptool to flash the entire project, from an argfile generated by the build system
|
||||
"""
|
||||
@@ -147,8 +148,7 @@ def action_extensions(base_actions, project_path):
|
||||
"callback": flash,
|
||||
"help": "Flash the project.",
|
||||
"options": global_options + [baud_rate, port],
|
||||
"dependencies": ["all"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["all", "erase_flash"],
|
||||
},
|
||||
"erase_flash": {
|
||||
"callback": erase_flash,
|
||||
@@ -197,34 +197,29 @@ def action_extensions(base_actions, project_path):
|
||||
"callback": flash,
|
||||
"help": "Flash partition table only.",
|
||||
"options": [baud_rate, port],
|
||||
"dependencies": ["partition_table"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["partition_table", "erase_flash"],
|
||||
},
|
||||
"bootloader-flash": {
|
||||
"callback": flash,
|
||||
"help": "Flash bootloader only.",
|
||||
"options": [baud_rate, port],
|
||||
"dependencies": ["bootloader"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["bootloader", "erase_flash"],
|
||||
},
|
||||
"app-flash": {
|
||||
"callback": flash,
|
||||
"help": "Flash the app only.",
|
||||
"options": [baud_rate, port],
|
||||
"dependencies": ["app"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["app", "erase_flash"],
|
||||
},
|
||||
"encrypted-app-flash": {
|
||||
"callback": flash,
|
||||
"help": "Flash the encrypted app only.",
|
||||
"dependencies": ["app"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["app", "erase_flash"],
|
||||
},
|
||||
"encrypted-flash": {
|
||||
"callback": flash,
|
||||
"help": "Flash the encrypted project.",
|
||||
"dependencies": ["all"],
|
||||
"order_dependencies": ["erase_flash"],
|
||||
"order_dependencies": ["all", "erase_flash"],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@@ -84,7 +84,7 @@ class TestDependencyManagement(unittest.TestCase):
|
||||
args=['--dry-run', 'flash'],
|
||||
standalone_mode=False,
|
||||
)
|
||||
self.assertEqual(['all', 'flash'], list(result.keys()))
|
||||
self.assertEqual(['flash'], list(result.keys()))
|
||||
|
||||
def test_order_only_dependencies(self):
|
||||
result = idf.init_cli()(
|
||||
@@ -105,7 +105,7 @@ class TestDependencyManagement(unittest.TestCase):
|
||||
args=['--dry-run', 'clean', 'monitor', 'clean', 'fullclean', 'flash'],
|
||||
standalone_mode=False,
|
||||
)
|
||||
self.assertEqual(['fullclean', 'clean', 'all', 'flash', 'monitor'], list(result.keys()))
|
||||
self.assertEqual(['fullclean', 'clean', 'flash', 'monitor'], list(result.keys()))
|
||||
|
||||
def test_dupplicated_commands_warning(self):
|
||||
capturedOutput = StringIO()
|
||||
|
Reference in New Issue
Block a user