espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(tools): Update ccache 4.10.2 -> 4.11.2

Browse Source 
Closes https://github.com/espressif/idf-installer/issues/305
This commit is contained in:
Marek Fiala
2025-04-11 13:00:37 +02:00
committed by BOT
parent 74f0347b9c
commit cb649d7201
2 changed files with 227 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

404
tools/test_idf_tools/test_idf_tools.py
View File

@@ -651,42 +651,42 @@ class TestUsageWin(TestUsage):
self.assertIn('version installed in tools directory: ' + tool_version, output) self.assertIn('version installed in tools directory: ' + tool_version, output)
output = self.run_idf_tools_with_action(['export']) output = self.run_idf_tools_with_action(['export'])
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin'), output
), output) )
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin'),
), output) output,
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin'), output
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin'),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin' )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin' self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin' self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION )
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION), output)
self.assertIn(os.path.join( self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64' os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
), output) )
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64' os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
), output) )
output = self.run_idf_tools_with_action(['list', '--outdated']) output = self.run_idf_tools_with_action(['list', '--outdated'])
self.assertEqual('', output) self.assertEqual('', output)
@@ -744,42 +744,50 @@ class TestUsageWin(TestUsage):
self.assertNotIn('version installed in tools directory: ' + DFU_UTIL_VERSION, output) self.assertNotIn('version installed in tools directory: ' + DFU_UTIL_VERSION, output)
output = self.run_idf_tools_with_action(['export']) output = self.run_idf_tools_with_action(['export'])
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin'), output
), output) )
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin'),
), output) output,
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin'), output
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin' self.assertIn(
), output) os.path.join(
self.assertNotIn(os.path.join( self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin'
self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin' ),
), output) output,
self.assertNotIn(os.path.join( )
self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin' self.assertNotIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin'),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION, )
), output) self.assertNotIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin' self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION self.temp_tools_dir,
), output) 'tools',
self.assertIn(os.path.join( 'esp-rom-elfs',
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64' ESP_ROM_ELFS_VERSION,
), output) ),
self.assertNotIn(os.path.join( output,
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64' )
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
)
self.assertNotIn(
os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
)
def test_tools_for_esp32c3_win(self): def test_tools_for_esp32c3_win(self):
required_tools_installed = 8 required_tools_installed = 8
@@ -806,39 +814,44 @@ class TestUsageWin(TestUsage):
self.assertNotIn('version installed in tools directory: ' + DFU_UTIL_VERSION, output) self.assertNotIn('version installed in tools directory: ' + DFU_UTIL_VERSION, output)
output = self.run_idf_tools_with_action(['export']) output = self.run_idf_tools_with_action(['export'])
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin'), output
), output) )
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin'),
), output) output,
self.assertNotIn(os.path.join( )
self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin' self.assertNotIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin'), output
self.assertNotIn(os.path.join( )
self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin' self.assertNotIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin'),
self.assertNotIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin' )
), output) self.assertNotIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION, self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin' )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION self.temp_tools_dir,
), output) 'tools',
self.assertIn(os.path.join( 'esp-rom-elfs',
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION ESP_ROM_ELFS_VERSION,
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64' )
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.assertNotIn(os.path.join( self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64' self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
), output) self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
)
self.assertNotIn(
os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
)
def test_tools_for_esp32s2_win(self): def test_tools_for_esp32s2_win(self):
required_tools_installed = 11 required_tools_installed = 11
@@ -864,42 +877,50 @@ class TestUsageWin(TestUsage):
self.assertIn('version installed in tools directory: ' + tool_version, output) self.assertIn('version installed in tools directory: ' + tool_version, output)
output = self.run_idf_tools_with_action(['export']) output = self.run_idf_tools_with_action(['export'])
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin'),
), output) output,
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin'), output
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin'), output
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin'),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin' )
), output) self.assertIn(
self.assertNotIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin' self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION, )
), output) self.assertNotIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin' self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION self.temp_tools_dir,
), output) 'tools',
self.assertIn(os.path.join( 'esp-rom-elfs',
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64' ESP_ROM_ELFS_VERSION,
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64' )
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
)
self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
)
def test_tools_for_esp32s3_win(self): def test_tools_for_esp32s3_win(self):
required_tools_installed = 11 required_tools_installed = 11
@@ -927,42 +948,50 @@ class TestUsageWin(TestUsage):
self.assertIn('version installed in tools directory: ' + tool_version, output) self.assertIn('version installed in tools directory: ' + tool_version, output)
output = self.run_idf_tools_with_action(['export']) output = self.run_idf_tools_with_action(['export'])
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin'), output
), output) )
self.assertIn(os.path.join( self.assertIn(
self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin' os.path.join(self.temp_tools_dir, 'tools', 'xtensa-esp-elf', XTENSA_ELF_VERSION, 'xtensa-esp-elf', 'bin'),
), output) output,
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'esp32ulp-elf', ESP32ULP_VERSION, 'esp32ulp-elf', 'bin'), output
self.assertIn(os.path.join( )
self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin' self.assertIn(
), output) os.path.join(self.temp_tools_dir, 'tools', 'riscv32-esp-elf', RISCV_ELF_VERSION, 'riscv32-esp-elf', 'bin'),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin' )
), output) self.assertIn(
self.assertNotIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin' self.temp_tools_dir, 'tools', 'xtensa-esp-elf-gdb', XTENSA_ESP_GDB_VERSION, 'xtensa-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', 'esp-rom-elfs', ESP_ROM_ELFS_VERSION, )
), output) self.assertNotIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin' self.temp_tools_dir, 'tools', 'riscv32-esp-elf-gdb', RISCV_ESP_GDB_VERSION, 'riscv32-esp-elf-gdb', 'bin'
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION )
), output) self.assertIn(
self.assertIn(os.path.join( os.path.join(
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION self.temp_tools_dir,
), output) 'tools',
self.assertIn(os.path.join( 'esp-rom-elfs',
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64' ESP_ROM_ELFS_VERSION,
), output) ),
self.assertIn(os.path.join( output,
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64' )
), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
)
self.assertIn(
os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
)
def test_tools_for_esp32p4_win(self): def test_tools_for_esp32p4_win(self):
required_tools_installed = 8 required_tools_installed = 8
@@ -994,11 +1023,22 @@ class TestUsageWin(TestUsage):
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output) self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'), output) self.assertIn(
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', XTENSA_ELF, XTENSA_ELF_VERSION, XTENSA_ELF, 'bin'), output) os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.11.2-windows-x86_64'), output
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', ESP32ULP, ESP32ULP_VERSION, ESP32ULP, 'bin'), output) )
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB, 'bin'), output) self.assertNotIn(
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output) os.path.join(self.temp_tools_dir, 'tools', XTENSA_ELF, XTENSA_ELF_VERSION, XTENSA_ELF, 'bin'), output
)
self.assertNotIn(
os.path.join(self.temp_tools_dir, 'tools', ESP32ULP, ESP32ULP_VERSION, ESP32ULP, 'bin'), output
)
self.assertNotIn(
os.path.join(self.temp_tools_dir, 'tools', XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB, 'bin'),
output,
)
self.assertNotIn(
os.path.join(self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'), output
)
# a different test for qemu because of "on_request" # a different test for qemu because of "on_request"
def test_tools_for_qemu_with_required_win(self): def test_tools_for_qemu_with_required_win(self):

10
tools/tools.json
View File

@@ -759,7 +759,7 @@
"description": "Ccache (compiler cache)", "description": "Ccache (compiler cache)",
"export_paths": [ "export_paths": [
[ [
"ccache-4.10.2-windows-x86_64" "ccache-4.11.2-windows-x86_64"
] ]
], ],
"export_vars": { "export_vars": {
@@ -787,12 +787,12 @@
"version_regex": "ccache version ([0-9.]+)", "version_regex": "ccache version ([0-9.]+)",
"versions": [ "versions": [
{ {
"name": "4.10.2", "name": "4.11.2",
"status": "recommended", "status": "recommended",
"win64": { "win64": {
"sha256": "6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9", "sha256": "1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c",
"size": 1610890, "size": 1642225,
"url": "https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip" "url": "https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip"
} }
} }
] ]