mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-08 04:02:27 +00:00
partition_table: implement new parttool functionality
This commit is contained in:
@@ -398,13 +398,13 @@ app,app, factory, 32K, 1M
|
||||
|
||||
class PartToolTests(Py23TestCase):
|
||||
|
||||
def _run_parttool(self, csvcontents, args):
|
||||
def _run_parttool(self, csvcontents, args, info):
|
||||
csvpath = tempfile.mktemp()
|
||||
with open(csvpath, "w") as f:
|
||||
f.write(csvcontents)
|
||||
try:
|
||||
output = subprocess.check_output([sys.executable, "../parttool.py"] + args.split(" ") + [ csvpath ],
|
||||
stderr=subprocess.STDOUT)
|
||||
output = subprocess.check_output([sys.executable, "../parttool.py"] + args.split(" ")
|
||||
+ ["--partition-table-file", csvpath , "get_partition_info", "--info", info], stderr=subprocess.STDOUT)
|
||||
self.assertNotIn(b"WARNING", output)
|
||||
m = re.search(b"0x[0-9a-fA-F]+", output)
|
||||
return m.group(0) if m else ""
|
||||
@@ -418,16 +418,16 @@ otadata, data, ota, 0xd000, 0x2000
|
||||
phy_init, data, phy, 0xf000, 0x1000
|
||||
factory, app, factory, 0x10000, 1M
|
||||
"""
|
||||
rpt = lambda args: self._run_parttool(csv, args)
|
||||
rpt = lambda args, info: self._run_parttool(csv, args, info)
|
||||
|
||||
self.assertEqual(
|
||||
rpt("--type data --subtype nvs --offset"), b"0x9000")
|
||||
rpt("--partition-type=data --partition-subtype=nvs -q", "offset"), b"0x9000")
|
||||
self.assertEqual(
|
||||
rpt("--type data --subtype nvs --size"), b"0x4000")
|
||||
rpt("--partition-type=data --partition-subtype=nvs -q", "size"), b"0x4000")
|
||||
self.assertEqual(
|
||||
rpt("--partition-name otadata --offset"), b"0xd000")
|
||||
rpt("--partition-name=otadata -q", "offset"), b"0xd000")
|
||||
self.assertEqual(
|
||||
rpt("--default-boot-partition --offset"), b"0x10000")
|
||||
rpt("--partition-boot-default -q", "offset"), b"0x10000")
|
||||
|
||||
def test_fallback(self):
|
||||
csv = """
|
||||
@@ -437,15 +437,15 @@ phy_init, data, phy, 0xf000, 0x1000
|
||||
ota_0, app, ota_0, 0x30000, 1M
|
||||
ota_1, app, ota_1, , 1M
|
||||
"""
|
||||
rpt = lambda args: self._run_parttool(csv, args)
|
||||
rpt = lambda args, info: self._run_parttool(csv, args, info)
|
||||
|
||||
self.assertEqual(
|
||||
rpt("--type app --subtype ota_1 --offset"), b"0x130000")
|
||||
rpt("--partition-type=app --partition-subtype=ota_1 -q", "offset"), b"0x130000")
|
||||
self.assertEqual(
|
||||
rpt("--default-boot-partition --offset"), b"0x30000") # ota_0
|
||||
rpt("--partition-boot-default -q", "offset"), b"0x30000") # ota_0
|
||||
csv_mod = csv.replace("ota_0", "ota_2")
|
||||
self.assertEqual(
|
||||
self._run_parttool(csv_mod, "--default-boot-partition --offset"),
|
||||
self._run_parttool(csv_mod, "--partition-boot-default -q", "offset"),
|
||||
b"0x130000") # now default is ota_1
|
||||
|
||||
if __name__ =="__main__":
|
||||
|
Reference in New Issue
Block a user