usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build.plat: in Platform.add_file(), allow adding exact duplicates.

Browse source
This commit is contained in:
whitequark 2019-11-15 23:40:44 +00:00
parent fe400b5dbc
commit 834fe3c700
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nmigen/build/plat.py
View file

@ -50,15 +50,17 @@ class Platform(ResourceManager, metaclass=ABCMeta):
if not isinstance(filename, str):
raise TypeError("File name must be a string, not {!r}"
.format(filename))
if filename in self.extra_files:
raise ValueError("File {!r} already exists"
.format(filename))
if hasattr(content, "read"):
content = content.read()
elif not isinstance(content, (str, bytes)):
raise TypeError("File contents must be str, bytes, or a file-like object, not {!r}"
.format(content))
self.extra_files[filename] = content
if filename in self.extra_files:
if self.extra_files[filename] != content:
raise ValueError("File {!r} already exists"
.format(filename))
else:
self.extra_files[filename] = content
@property
def _toolchain_env_var(self):

4
nmigen/test/test_build_plat.py
View file

@ -25,6 +25,10 @@ class PlatformTestCase(FHDLTestCase):
self.platform.add_file("x.txt", b"foo")
self.assertEqual(self.platform.extra_files["x.txt"], b"foo")
def test_add_file_exact_duplicate(self):
self.platform.add_file("x.txt", b"foo")
self.platform.add_file("x.txt", b"foo")
def test_add_file_io(self):
with open(__file__) as f:
self.platform.add_file("x.txt", f)