From bdcf92bd566364b8d368023b37868bf957eb89b2 Mon Sep 17 00:00:00 2001 From: Zapta Date: Wed, 4 Dec 2024 20:23:33 -0800 Subject: [PATCH] Changed reference to board names to lower case. --- .vscode/launch.json | 38 +++++++++---------- apio/apio_context.py | 17 +++++---- apio/managers/examples.py | 10 ++--- test-boards/Alhambra-II/test_leds.py | 6 +-- .../Alhambra-II/icestudio/ledon/ledon_tb.gtkw | 4 +- .../TB/Alhambra-II/icestudio/tff/tff_tb.gtkw | 4 +- .../01-LEDs-buttons/01-LEDs-buttons.ice | 2 +- .../01-LEDs-buttons/01-LEDs-buttons_tb.gtkw | 4 +- .../01-LEDs-buttons/01-LEDs-buttons_tb.v | 0 .../01-LEDs-buttons/apio.ini | 0 .../01-LEDs-buttons/main.pcf | 0 .../01-LEDs-buttons/main.v | 0 .../02-jumping-LED/02-jumping-LED.ice | 0 .../02-jumping-LED/02-jumping-LED_tb.gtkw | 4 +- .../02-jumping-LED/02-jumping-LED_tb.v | 0 .../02-jumping-LED/apio.ini | 0 .../02-jumping-LED/main.pcf | 0 .../02-jumping-LED/main.v | 0 .../03-riscv-stop-watch.ice | 2 +- .../03-riscv-stop-watch_tb.gtkw | 4 +- .../03-riscv-stop-watch_tb.v | 0 .../03-riscv-stop-watch/apio.ini | 0 .../03-riscv-stop-watch/main.pcf | 0 .../03-riscv-stop-watch/main.v | 0 .../03-riscv-stop-watch/v5a4ee6.list | 0 .../03-riscv-stop-watch/v771499.list | 0 .../03-riscv-stop-watch/v9298ae.list | 0 .../03-riscv-stop-watch/vba98fe.list | 0 .../01-LEDs-buttons/01-LEDs-buttons.ice | 0 .../01-LEDs-buttons/apio.ini | 0 .../01-LEDs-buttons/main.pcf | 0 .../01-LEDs-buttons/main.v | 0 .../02-jumping-LED/02-jumping-LED.ice | 0 .../02-jumping-LED/apio.ini | 0 .../02-jumping-LED/main.pcf | 0 .../02-jumping-LED/main.v | 0 .../Blinky/Blinky.v | 0 .../Blinky/apio.ini | 0 .../Blinky/info | 0 .../Blinky/pinout.lpf | 0 .../01-LEDs-buttons/01-LEDs-buttons.ice | 0 .../01-LEDs-buttons/apio.ini | 0 .../01-LEDs-buttons/main.pcf | 0 .../01-LEDs-buttons/main.v | 0 .../02-jumping-LED/02-jumping-LED.ice | 0 .../02-jumping-LED/apio.ini | 0 .../02-jumping-LED/main.pcf | 0 .../02-jumping-LED/main.v | 0 .../03-riscv-stop-watch.ice | 0 .../03-riscv-stop-watch/apio.ini | 0 .../03-riscv-stop-watch/main.pcf | 0 .../03-riscv-stop-watch/main.v | 0 .../03-riscv-stop-watch/v5a4ee6.list | 0 .../03-riscv-stop-watch/v771499.list | 0 .../03-riscv-stop-watch/v9298ae.list | 0 .../03-riscv-stop-watch/vba98fe.list | 0 .../01-LEDs/01-LEDs.ice | 0 .../{Icestick => icestick}/01-LEDs/apio.ini | 0 .../{Icestick => icestick}/01-LEDs/main.pcf | 0 .../{Icestick => icestick}/01-LEDs/main.v | 0 .../02-jumping-LED/02-jumping-LED.ice | 0 .../02-jumping-LED/apio.ini | 0 .../02-jumping-LED/main.pcf | 0 .../02-jumping-LED/main.v | 0 .../03-riscv-stop-watch.ice | 0 .../03-riscv-stop-watch/apio.ini | 0 .../03-riscv-stop-watch/main.pcf | 0 .../03-riscv-stop-watch/main.v | 0 .../03-riscv-stop-watch/v5a4ee6.list | 0 .../03-riscv-stop-watch/v771499.list | 0 .../03-riscv-stop-watch/v9298ae.list | 0 .../03-riscv-stop-watch/vba98fe.list | 0 .../01-LED-ON/01-LED-ON.ice | 0 .../01-LED-ON/apio.ini | 0 .../01-LED-ON/main.pcf | 0 .../01-LED-ON/main.v | 0 .../02-jumping-LED/02-jumping-LED.ice | 0 .../02-jumping-LED/apio.ini | 0 .../02-jumping-LED/main.pcf | 0 .../02-jumping-LED/main.v | 0 .../03-riscv-stop-watch.ice | 0 .../03-riscv-stop-watch/apio.ini | 0 .../03-riscv-stop-watch/main.pcf | 0 .../03-riscv-stop-watch/main.v | 0 .../03-riscv-stop-watch/v5a4ee6.list | 0 .../03-riscv-stop-watch/v771499.list | 0 .../03-riscv-stop-watch/v9298ae.list | 0 .../03-riscv-stop-watch/vba98fe.list | 0 test/integration/test_examples.py | 24 ++++++------ test/integration/test_packages.py | 6 +-- test/integration/test_projects.py | 2 +- 91 files changed, 65 insertions(+), 62 deletions(-) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/01-LEDs-buttons.ice (99%) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw (69%) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/01-LEDs-buttons_tb.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/apio.ini (100%) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/main.pcf (100%) rename test-examples/{Alhambra-II => alhambra-ii}/01-LEDs-buttons/main.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/02-jumping-LED.ice (100%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/02-jumping-LED_tb.gtkw (74%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/02-jumping-LED_tb.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/apio.ini (100%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/main.pcf (100%) rename test-examples/{Alhambra-II => alhambra-ii}/02-jumping-LED/main.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/03-riscv-stop-watch.ice (99%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw (75%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/03-riscv-stop-watch_tb.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/apio.ini (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/main.pcf (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/main.v (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/v5a4ee6.list (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/v771499.list (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/v9298ae.list (100%) rename test-examples/{Alhambra-II => alhambra-ii}/03-riscv-stop-watch/vba98fe.list (100%) rename test-examples/{BlackIce => blackice}/01-LEDs-buttons/01-LEDs-buttons.ice (100%) rename test-examples/{BlackIce => blackice}/01-LEDs-buttons/apio.ini (100%) rename test-examples/{BlackIce => blackice}/01-LEDs-buttons/main.pcf (100%) rename test-examples/{BlackIce => blackice}/01-LEDs-buttons/main.v (100%) rename test-examples/{BlackIce => blackice}/02-jumping-LED/02-jumping-LED.ice (100%) rename test-examples/{BlackIce => blackice}/02-jumping-LED/apio.ini (100%) rename test-examples/{BlackIce => blackice}/02-jumping-LED/main.pcf (100%) rename test-examples/{BlackIce => blackice}/02-jumping-LED/main.v (100%) rename test-examples/{ColorLight-5A-75B-V8 => colorlight-5a-75b-v8}/Blinky/Blinky.v (100%) rename test-examples/{ColorLight-5A-75B-V8 => colorlight-5a-75b-v8}/Blinky/apio.ini (100%) rename test-examples/{ColorLight-5A-75B-V8 => colorlight-5a-75b-v8}/Blinky/info (100%) rename test-examples/{ColorLight-5A-75B-V8 => colorlight-5a-75b-v8}/Blinky/pinout.lpf (100%) rename test-examples/{Icebreaker => icebreaker}/01-LEDs-buttons/01-LEDs-buttons.ice (100%) rename test-examples/{Icebreaker => icebreaker}/01-LEDs-buttons/apio.ini (100%) rename test-examples/{Icebreaker => icebreaker}/01-LEDs-buttons/main.pcf (100%) rename test-examples/{Icebreaker => icebreaker}/01-LEDs-buttons/main.v (100%) rename test-examples/{Icebreaker => icebreaker}/02-jumping-LED/02-jumping-LED.ice (100%) rename test-examples/{Icebreaker => icebreaker}/02-jumping-LED/apio.ini (100%) rename test-examples/{Icebreaker => icebreaker}/02-jumping-LED/main.pcf (100%) rename test-examples/{Icebreaker => icebreaker}/02-jumping-LED/main.v (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/03-riscv-stop-watch.ice (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/apio.ini (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/main.pcf (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/main.v (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/v5a4ee6.list (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/v771499.list (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/v9298ae.list (100%) rename test-examples/{Icebreaker => icebreaker}/03-riscv-stop-watch/vba98fe.list (100%) rename test-examples/{Icestick => icestick}/01-LEDs/01-LEDs.ice (100%) rename test-examples/{Icestick => icestick}/01-LEDs/apio.ini (100%) rename test-examples/{Icestick => icestick}/01-LEDs/main.pcf (100%) rename test-examples/{Icestick => icestick}/01-LEDs/main.v (100%) rename test-examples/{Icestick => icestick}/02-jumping-LED/02-jumping-LED.ice (100%) rename test-examples/{Icestick => icestick}/02-jumping-LED/apio.ini (100%) rename test-examples/{Icestick => icestick}/02-jumping-LED/main.pcf (100%) rename test-examples/{Icestick => icestick}/02-jumping-LED/main.v (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/03-riscv-stop-watch.ice (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/apio.ini (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/main.pcf (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/main.v (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/v5a4ee6.list (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/v771499.list (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/v9298ae.list (100%) rename test-examples/{Icestick => icestick}/03-riscv-stop-watch/vba98fe.list (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/01-LED-ON/01-LED-ON.ice (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/01-LED-ON/apio.ini (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/01-LED-ON/main.pcf (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/01-LED-ON/main.v (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/02-jumping-LED/02-jumping-LED.ice (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/02-jumping-LED/apio.ini (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/02-jumping-LED/main.pcf (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/02-jumping-LED/main.v (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/03-riscv-stop-watch.ice (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/apio.ini (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/main.pcf (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/main.v (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/v5a4ee6.list (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/v771499.list (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/v9298ae.list (100%) rename test-examples/{TinyFPGA-BX => tinyfpga-bx}/03-riscv-stop-watch/vba98fe.list (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json index 4f23d4ab..eb74e4db 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "program": "${workspaceFolder}/apio_run.py", "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio boards", @@ -21,7 +21,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio build", @@ -33,7 +33,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio clean", @@ -45,7 +45,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio create", @@ -62,7 +62,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio drivers", @@ -75,7 +75,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio examples", @@ -88,7 +88,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio graph", @@ -101,7 +101,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio install", @@ -116,7 +116,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio lint", @@ -128,7 +128,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio modify", @@ -144,7 +144,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio packages", @@ -158,7 +158,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio raw", @@ -171,7 +171,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio report", @@ -183,7 +183,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio system", @@ -196,7 +196,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio time", @@ -208,7 +208,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio uninstall", @@ -221,7 +221,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio upload [alhambra-ii]", @@ -233,7 +233,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Apio upload [TinyFPGA-BX]", @@ -281,7 +281,7 @@ ], "console": "integratedTerminal", "justMyCode": false, - "cwd": "${workspaceFolder}/test-examples/Alhambra-II/02-jumping-LED" + "cwd": "${workspaceFolder}/test-examples/alhambra-ii/02-jumping-LED" }, { "name": "Attach remote", diff --git a/apio/apio_context.py b/apio/apio_context.py index fcebc8e1..40ac885a 100644 --- a/apio/apio_context.py +++ b/apio/apio_context.py @@ -170,13 +170,16 @@ def __init__( resolver = _ProjectResolverImpl(self) self._project = load_project_from_file(self.project_dir, resolver) - def lookup_board_id(self, board: str) -> str: + def lookup_board_id( + self, board: str, *, warn: bool = True, strict: bool = True + ) -> str: """Lookup and return the board's canonical board id which is its key in boards.json(). 'board' can be the canonical id itself or a - legacy id of the board as defined in boards.json. The method exists - with a fatal error if the board is unknown, and prints a warning - message if 'board' is a legacy name rather then the canonical board - id""" + legacy id of the board as defined in boards.json. The method prints + a warning if 'board' is a legacy board id that is mapped to its + canonical name and 'warn' is True. If the board is not found, the + method returns None if 'strict' is False or exit the program with a + message if 'strict' is True.""" # -- If this fails, it's a programming error. assert board is not None @@ -194,7 +197,7 @@ def lookup_board_id(self, board: str) -> str: break # -- Fatal error if unknown board. - if canonical_id is None: + if strict and canonical_id is None: click.secho(f"Error: no such board '{board}'", fg="red") click.secho( "\nRun 'apio boards' for the list of board ids.", fg="yellow" @@ -202,7 +205,7 @@ def lookup_board_id(self, board: str) -> str: sys.exit(1) # -- Warning if caller used a legacy board id. - if board != canonical_id: + if warn and canonical_id and board != canonical_id: click.secho( f"Warning: '{board}' board name was changed. " f"Please use '{canonical_id}' instead.", diff --git a/apio/managers/examples.py b/apio/managers/examples.py index f003fb98..c04ebe95 100644 --- a/apio/managers/examples.py +++ b/apio/managers/examples.py @@ -144,10 +144,10 @@ def list_examples(self) -> None: def copy_example_dir(self, example: str, project_dir: Path, sayno: bool): """Copy the example creating the folder - Ex. The example Alhambra-II/ledon --> the folder Alhambra-II/ledon + Ex. The example alhambra-ii/ledon --> the folder alhambra-ii/ledon is created * INPUTS: - * example: Example name (Ex. 'Alhambra-II/ledon') + * example: Example name (Ex. 'alhambra-ii/ledon') * project_dir: (optional) * sayno: Automatically answer no """ @@ -205,7 +205,7 @@ def copy_example_dir(self, example: str, project_dir: Path, sayno: bool): def copy_example_files(self, example: str, project_dir: Path, sayno: bool): """Copy the example files (not the initial folders) * INPUTS: - * example: Example name (Ex. 'Alhambra-II/ledon') + * example: Example name (Ex. 'alhambra-ii/ledon') * project_dir: (optional) * sayno: Automatically answer no """ @@ -239,7 +239,7 @@ def _copy_files( ): """Copy the example files to the destination folder * INPUTS: - * example: Name of the example (Ex. 'Alhambra-II/ledon') + * example: Name of the example (Ex. 'alhambra-ii/ledon') * src_path: Source folder to copy * dest_path: Destination folder """ @@ -304,7 +304,7 @@ def _copy_files( def _copy_dir(self, example: str, src_path: Path, dest_path: Path): """Copy example of the src_path on the dest_path * INPUT - * example: Name of the example (Ex. 'Alhambra-II/ledon') + * example: Name of the example (Ex. 'alhambra-ii/ledon') * src_path: Source folder to copy * dest_path: Destination folder """ diff --git a/test-boards/Alhambra-II/test_leds.py b/test-boards/Alhambra-II/test_leds.py index a253a29a..8a0bccb3 100644 --- a/test-boards/Alhambra-II/test_leds.py +++ b/test-boards/Alhambra-II/test_leds.py @@ -1,5 +1,5 @@ """ -Testing the ledon example on the Alhambra-II board +Testing the ledon example on the alhambra-ii board """ import os @@ -30,7 +30,7 @@ cwd = Path.cwd() # -- Create the new path -ledon_dir = cwd / "test-examples" / "Alhambra-II" / "01-LEDs-buttons" +ledon_dir = cwd / "test-examples" / "alhambra-ii" / "01-LEDs-buttons" # -- Change to the new folder! os.chdir(ledon_dir) @@ -80,7 +80,7 @@ def test_ledon_verify(): def test_ledon_upload(): - """Test the apio upload. This requires a connected Alhambra-II board.""" + """Test the apio upload. This requires a connected alhambra-ii board.""" # ---------------------------- # -- Execute "apio upload" diff --git a/test-examples/TB/Alhambra-II/icestudio/ledon/ledon_tb.gtkw b/test-examples/TB/Alhambra-II/icestudio/ledon/ledon_tb.gtkw index 51d83052..dbec1818 100644 --- a/test-examples/TB/Alhambra-II/icestudio/ledon/ledon_tb.gtkw +++ b/test-examples/TB/Alhambra-II/icestudio/ledon/ledon_tb.gtkw @@ -2,10 +2,10 @@ [*] GTKWave Analyzer v3.4.0 (w)1999-2022 BSI [*] Wed Nov 20 22:19:57 2024 [*] -[dumpfile] "/Users/user/projects/apio_dev/repo/test-examples/TB/Alhambra-II/icestudio/ledon/_build/ledon_tb.vcd" +[dumpfile] "/Users/user/projects/apio_dev/repo/test-examples/TB/alhambra-ii/icestudio/ledon/_build/ledon_tb.vcd" [dumpfile_mtime] "Wed Nov 20 22:19:35 2024" [dumpfile_size] 580 -[savefile] "/Users/user/projects/apio_dev/repo/test-examples/TB/Alhambra-II/icestudio/ledon/ledon_tb.gtkw" +[savefile] "/Users/user/projects/apio_dev/repo/test-examples/TB/alhambra-ii/icestudio/ledon/ledon_tb.gtkw" [timestart] 0 [size] 1000 600 [pos] -1 -1 diff --git a/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.gtkw b/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.gtkw index e037b1ab..acbbda0c 100644 --- a/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.gtkw +++ b/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.gtkw @@ -2,10 +2,10 @@ [*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI [*] Thu Apr 28 09:24:55 2022 [*] -[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.vcd" +[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/TB/alhambra-ii/icestudio/tff/tff_tb.vcd" [dumpfile_mtime] "Thu Apr 28 09:24:05 2022" [dumpfile_size] 1734 -[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/TB/Alhambra-II/icestudio/tff/tff_tb.gtkw" +[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/TB/alhambra-ii/icestudio/tff/tff_tb.gtkw" [timestart] 0 [size] 1860 1016 [pos] -89 -89 diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons.ice b/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons.ice similarity index 99% rename from test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons.ice rename to test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons.ice index 3c2256c4..d7271566 100644 --- a/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons.ice +++ b/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons.ice @@ -344,7 +344,7 @@ "id": "65f463c9-91d8-4a92-aafa-fa050e5fc32b", "type": "basic.info", "data": { - "info": "# Alhambra-II: LEDs and Buttons test\n\nTesting the LEDs and buttons", + "info": "# alhambra-ii: LEDs and Buttons test\n\nTesting the LEDs and buttons", "readonly": true }, "position": { diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw b/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw similarity index 69% rename from test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw rename to test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw index 38aab1b1..6fa35a05 100644 --- a/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw +++ b/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw @@ -2,10 +2,10 @@ [*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI [*] Thu Apr 28 10:19:00 2022 [*] -[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.vcd" +[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.vcd" [dumpfile_mtime] "Thu Apr 28 10:16:09 2022" [dumpfile_size] 10049 -[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw" +[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.gtkw" [timestart] 0 [size] 1000 600 [pos] 793 49 diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.v b/test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.v similarity index 100% rename from test-examples/Alhambra-II/01-LEDs-buttons/01-LEDs-buttons_tb.v rename to test-examples/alhambra-ii/01-LEDs-buttons/01-LEDs-buttons_tb.v diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/apio.ini b/test-examples/alhambra-ii/01-LEDs-buttons/apio.ini similarity index 100% rename from test-examples/Alhambra-II/01-LEDs-buttons/apio.ini rename to test-examples/alhambra-ii/01-LEDs-buttons/apio.ini diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/main.pcf b/test-examples/alhambra-ii/01-LEDs-buttons/main.pcf similarity index 100% rename from test-examples/Alhambra-II/01-LEDs-buttons/main.pcf rename to test-examples/alhambra-ii/01-LEDs-buttons/main.pcf diff --git a/test-examples/Alhambra-II/01-LEDs-buttons/main.v b/test-examples/alhambra-ii/01-LEDs-buttons/main.v similarity index 100% rename from test-examples/Alhambra-II/01-LEDs-buttons/main.v rename to test-examples/alhambra-ii/01-LEDs-buttons/main.v diff --git a/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED.ice b/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED.ice similarity index 100% rename from test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED.ice rename to test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED.ice diff --git a/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.gtkw b/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.gtkw similarity index 74% rename from test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.gtkw rename to test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.gtkw index 9bebbc80..dd21b25f 100644 --- a/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.gtkw +++ b/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.gtkw @@ -2,10 +2,10 @@ [*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI [*] Thu Apr 28 10:41:03 2022 [*] -[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.vcd" +[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.vcd" [dumpfile_mtime] "Thu Apr 28 10:38:49 2022" [dumpfile_size] 739918 -[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.gtkw" +[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.gtkw" [timestart] 0 [size] 1860 1016 [pos] 60 27 diff --git a/test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.v b/test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.v similarity index 100% rename from test-examples/Alhambra-II/02-jumping-LED/02-jumping-LED_tb.v rename to test-examples/alhambra-ii/02-jumping-LED/02-jumping-LED_tb.v diff --git a/test-examples/Alhambra-II/02-jumping-LED/apio.ini b/test-examples/alhambra-ii/02-jumping-LED/apio.ini similarity index 100% rename from test-examples/Alhambra-II/02-jumping-LED/apio.ini rename to test-examples/alhambra-ii/02-jumping-LED/apio.ini diff --git a/test-examples/Alhambra-II/02-jumping-LED/main.pcf b/test-examples/alhambra-ii/02-jumping-LED/main.pcf similarity index 100% rename from test-examples/Alhambra-II/02-jumping-LED/main.pcf rename to test-examples/alhambra-ii/02-jumping-LED/main.pcf diff --git a/test-examples/Alhambra-II/02-jumping-LED/main.v b/test-examples/alhambra-ii/02-jumping-LED/main.v similarity index 100% rename from test-examples/Alhambra-II/02-jumping-LED/main.v rename to test-examples/alhambra-ii/02-jumping-LED/main.v diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch.ice b/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch.ice similarity index 99% rename from test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch.ice rename to test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch.ice index 3c3c458b..941bb4a4 100644 --- a/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch.ice +++ b/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch.ice @@ -142,7 +142,7 @@ "id": "548537d2-05af-4772-8269-4a4a038e8fd5", "type": "basic.info", "data": { - "info": "## Alhambra-II: RISC-V stopwatch on LEDs", + "info": "## alhambra-ii: RISC-V stopwatch on LEDs", "readonly": true }, "position": { diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw b/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw similarity index 75% rename from test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw rename to test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw index d2691127..c4eb57ad 100644 --- a/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw +++ b/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw @@ -2,10 +2,10 @@ [*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI [*] Thu Apr 28 10:51:01 2022 [*] -[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.vcd" +[dumpfile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.vcd" [dumpfile_mtime] "Thu Apr 28 10:47:25 2022" [dumpfile_size] 264544 -[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw" +[savefile] "/home/obijuan/Develop/FPGAwars/apio/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.gtkw" [timestart] 0 [size] 1920 1043 [pos] 1771 -116 diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.v b/test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.v similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/03-riscv-stop-watch_tb.v rename to test-examples/alhambra-ii/03-riscv-stop-watch/03-riscv-stop-watch_tb.v diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/apio.ini b/test-examples/alhambra-ii/03-riscv-stop-watch/apio.ini similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/apio.ini rename to test-examples/alhambra-ii/03-riscv-stop-watch/apio.ini diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/main.pcf b/test-examples/alhambra-ii/03-riscv-stop-watch/main.pcf similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/main.pcf rename to test-examples/alhambra-ii/03-riscv-stop-watch/main.pcf diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/main.v b/test-examples/alhambra-ii/03-riscv-stop-watch/main.v similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/main.v rename to test-examples/alhambra-ii/03-riscv-stop-watch/main.v diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/v5a4ee6.list b/test-examples/alhambra-ii/03-riscv-stop-watch/v5a4ee6.list similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/v5a4ee6.list rename to test-examples/alhambra-ii/03-riscv-stop-watch/v5a4ee6.list diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/v771499.list b/test-examples/alhambra-ii/03-riscv-stop-watch/v771499.list similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/v771499.list rename to test-examples/alhambra-ii/03-riscv-stop-watch/v771499.list diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/v9298ae.list b/test-examples/alhambra-ii/03-riscv-stop-watch/v9298ae.list similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/v9298ae.list rename to test-examples/alhambra-ii/03-riscv-stop-watch/v9298ae.list diff --git a/test-examples/Alhambra-II/03-riscv-stop-watch/vba98fe.list b/test-examples/alhambra-ii/03-riscv-stop-watch/vba98fe.list similarity index 100% rename from test-examples/Alhambra-II/03-riscv-stop-watch/vba98fe.list rename to test-examples/alhambra-ii/03-riscv-stop-watch/vba98fe.list diff --git a/test-examples/BlackIce/01-LEDs-buttons/01-LEDs-buttons.ice b/test-examples/blackice/01-LEDs-buttons/01-LEDs-buttons.ice similarity index 100% rename from test-examples/BlackIce/01-LEDs-buttons/01-LEDs-buttons.ice rename to test-examples/blackice/01-LEDs-buttons/01-LEDs-buttons.ice diff --git a/test-examples/BlackIce/01-LEDs-buttons/apio.ini b/test-examples/blackice/01-LEDs-buttons/apio.ini similarity index 100% rename from test-examples/BlackIce/01-LEDs-buttons/apio.ini rename to test-examples/blackice/01-LEDs-buttons/apio.ini diff --git a/test-examples/BlackIce/01-LEDs-buttons/main.pcf b/test-examples/blackice/01-LEDs-buttons/main.pcf similarity index 100% rename from test-examples/BlackIce/01-LEDs-buttons/main.pcf rename to test-examples/blackice/01-LEDs-buttons/main.pcf diff --git a/test-examples/BlackIce/01-LEDs-buttons/main.v b/test-examples/blackice/01-LEDs-buttons/main.v similarity index 100% rename from test-examples/BlackIce/01-LEDs-buttons/main.v rename to test-examples/blackice/01-LEDs-buttons/main.v diff --git a/test-examples/BlackIce/02-jumping-LED/02-jumping-LED.ice b/test-examples/blackice/02-jumping-LED/02-jumping-LED.ice similarity index 100% rename from test-examples/BlackIce/02-jumping-LED/02-jumping-LED.ice rename to test-examples/blackice/02-jumping-LED/02-jumping-LED.ice diff --git a/test-examples/BlackIce/02-jumping-LED/apio.ini b/test-examples/blackice/02-jumping-LED/apio.ini similarity index 100% rename from test-examples/BlackIce/02-jumping-LED/apio.ini rename to test-examples/blackice/02-jumping-LED/apio.ini diff --git a/test-examples/BlackIce/02-jumping-LED/main.pcf b/test-examples/blackice/02-jumping-LED/main.pcf similarity index 100% rename from test-examples/BlackIce/02-jumping-LED/main.pcf rename to test-examples/blackice/02-jumping-LED/main.pcf diff --git a/test-examples/BlackIce/02-jumping-LED/main.v b/test-examples/blackice/02-jumping-LED/main.v similarity index 100% rename from test-examples/BlackIce/02-jumping-LED/main.v rename to test-examples/blackice/02-jumping-LED/main.v diff --git a/test-examples/ColorLight-5A-75B-V8/Blinky/Blinky.v b/test-examples/colorlight-5a-75b-v8/Blinky/Blinky.v similarity index 100% rename from test-examples/ColorLight-5A-75B-V8/Blinky/Blinky.v rename to test-examples/colorlight-5a-75b-v8/Blinky/Blinky.v diff --git a/test-examples/ColorLight-5A-75B-V8/Blinky/apio.ini b/test-examples/colorlight-5a-75b-v8/Blinky/apio.ini similarity index 100% rename from test-examples/ColorLight-5A-75B-V8/Blinky/apio.ini rename to test-examples/colorlight-5a-75b-v8/Blinky/apio.ini diff --git a/test-examples/ColorLight-5A-75B-V8/Blinky/info b/test-examples/colorlight-5a-75b-v8/Blinky/info similarity index 100% rename from test-examples/ColorLight-5A-75B-V8/Blinky/info rename to test-examples/colorlight-5a-75b-v8/Blinky/info diff --git a/test-examples/ColorLight-5A-75B-V8/Blinky/pinout.lpf b/test-examples/colorlight-5a-75b-v8/Blinky/pinout.lpf similarity index 100% rename from test-examples/ColorLight-5A-75B-V8/Blinky/pinout.lpf rename to test-examples/colorlight-5a-75b-v8/Blinky/pinout.lpf diff --git a/test-examples/Icebreaker/01-LEDs-buttons/01-LEDs-buttons.ice b/test-examples/icebreaker/01-LEDs-buttons/01-LEDs-buttons.ice similarity index 100% rename from test-examples/Icebreaker/01-LEDs-buttons/01-LEDs-buttons.ice rename to test-examples/icebreaker/01-LEDs-buttons/01-LEDs-buttons.ice diff --git a/test-examples/Icebreaker/01-LEDs-buttons/apio.ini b/test-examples/icebreaker/01-LEDs-buttons/apio.ini similarity index 100% rename from test-examples/Icebreaker/01-LEDs-buttons/apio.ini rename to test-examples/icebreaker/01-LEDs-buttons/apio.ini diff --git a/test-examples/Icebreaker/01-LEDs-buttons/main.pcf b/test-examples/icebreaker/01-LEDs-buttons/main.pcf similarity index 100% rename from test-examples/Icebreaker/01-LEDs-buttons/main.pcf rename to test-examples/icebreaker/01-LEDs-buttons/main.pcf diff --git a/test-examples/Icebreaker/01-LEDs-buttons/main.v b/test-examples/icebreaker/01-LEDs-buttons/main.v similarity index 100% rename from test-examples/Icebreaker/01-LEDs-buttons/main.v rename to test-examples/icebreaker/01-LEDs-buttons/main.v diff --git a/test-examples/Icebreaker/02-jumping-LED/02-jumping-LED.ice b/test-examples/icebreaker/02-jumping-LED/02-jumping-LED.ice similarity index 100% rename from test-examples/Icebreaker/02-jumping-LED/02-jumping-LED.ice rename to test-examples/icebreaker/02-jumping-LED/02-jumping-LED.ice diff --git a/test-examples/Icebreaker/02-jumping-LED/apio.ini b/test-examples/icebreaker/02-jumping-LED/apio.ini similarity index 100% rename from test-examples/Icebreaker/02-jumping-LED/apio.ini rename to test-examples/icebreaker/02-jumping-LED/apio.ini diff --git a/test-examples/Icebreaker/02-jumping-LED/main.pcf b/test-examples/icebreaker/02-jumping-LED/main.pcf similarity index 100% rename from test-examples/Icebreaker/02-jumping-LED/main.pcf rename to test-examples/icebreaker/02-jumping-LED/main.pcf diff --git a/test-examples/Icebreaker/02-jumping-LED/main.v b/test-examples/icebreaker/02-jumping-LED/main.v similarity index 100% rename from test-examples/Icebreaker/02-jumping-LED/main.v rename to test-examples/icebreaker/02-jumping-LED/main.v diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/03-riscv-stop-watch.ice b/test-examples/icebreaker/03-riscv-stop-watch/03-riscv-stop-watch.ice similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/03-riscv-stop-watch.ice rename to test-examples/icebreaker/03-riscv-stop-watch/03-riscv-stop-watch.ice diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/apio.ini b/test-examples/icebreaker/03-riscv-stop-watch/apio.ini similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/apio.ini rename to test-examples/icebreaker/03-riscv-stop-watch/apio.ini diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/main.pcf b/test-examples/icebreaker/03-riscv-stop-watch/main.pcf similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/main.pcf rename to test-examples/icebreaker/03-riscv-stop-watch/main.pcf diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/main.v b/test-examples/icebreaker/03-riscv-stop-watch/main.v similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/main.v rename to test-examples/icebreaker/03-riscv-stop-watch/main.v diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/v5a4ee6.list b/test-examples/icebreaker/03-riscv-stop-watch/v5a4ee6.list similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/v5a4ee6.list rename to test-examples/icebreaker/03-riscv-stop-watch/v5a4ee6.list diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/v771499.list b/test-examples/icebreaker/03-riscv-stop-watch/v771499.list similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/v771499.list rename to test-examples/icebreaker/03-riscv-stop-watch/v771499.list diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/v9298ae.list b/test-examples/icebreaker/03-riscv-stop-watch/v9298ae.list similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/v9298ae.list rename to test-examples/icebreaker/03-riscv-stop-watch/v9298ae.list diff --git a/test-examples/Icebreaker/03-riscv-stop-watch/vba98fe.list b/test-examples/icebreaker/03-riscv-stop-watch/vba98fe.list similarity index 100% rename from test-examples/Icebreaker/03-riscv-stop-watch/vba98fe.list rename to test-examples/icebreaker/03-riscv-stop-watch/vba98fe.list diff --git a/test-examples/Icestick/01-LEDs/01-LEDs.ice b/test-examples/icestick/01-LEDs/01-LEDs.ice similarity index 100% rename from test-examples/Icestick/01-LEDs/01-LEDs.ice rename to test-examples/icestick/01-LEDs/01-LEDs.ice diff --git a/test-examples/Icestick/01-LEDs/apio.ini b/test-examples/icestick/01-LEDs/apio.ini similarity index 100% rename from test-examples/Icestick/01-LEDs/apio.ini rename to test-examples/icestick/01-LEDs/apio.ini diff --git a/test-examples/Icestick/01-LEDs/main.pcf b/test-examples/icestick/01-LEDs/main.pcf similarity index 100% rename from test-examples/Icestick/01-LEDs/main.pcf rename to test-examples/icestick/01-LEDs/main.pcf diff --git a/test-examples/Icestick/01-LEDs/main.v b/test-examples/icestick/01-LEDs/main.v similarity index 100% rename from test-examples/Icestick/01-LEDs/main.v rename to test-examples/icestick/01-LEDs/main.v diff --git a/test-examples/Icestick/02-jumping-LED/02-jumping-LED.ice b/test-examples/icestick/02-jumping-LED/02-jumping-LED.ice similarity index 100% rename from test-examples/Icestick/02-jumping-LED/02-jumping-LED.ice rename to test-examples/icestick/02-jumping-LED/02-jumping-LED.ice diff --git a/test-examples/Icestick/02-jumping-LED/apio.ini b/test-examples/icestick/02-jumping-LED/apio.ini similarity index 100% rename from test-examples/Icestick/02-jumping-LED/apio.ini rename to test-examples/icestick/02-jumping-LED/apio.ini diff --git a/test-examples/Icestick/02-jumping-LED/main.pcf b/test-examples/icestick/02-jumping-LED/main.pcf similarity index 100% rename from test-examples/Icestick/02-jumping-LED/main.pcf rename to test-examples/icestick/02-jumping-LED/main.pcf diff --git a/test-examples/Icestick/02-jumping-LED/main.v b/test-examples/icestick/02-jumping-LED/main.v similarity index 100% rename from test-examples/Icestick/02-jumping-LED/main.v rename to test-examples/icestick/02-jumping-LED/main.v diff --git a/test-examples/Icestick/03-riscv-stop-watch/03-riscv-stop-watch.ice b/test-examples/icestick/03-riscv-stop-watch/03-riscv-stop-watch.ice similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/03-riscv-stop-watch.ice rename to test-examples/icestick/03-riscv-stop-watch/03-riscv-stop-watch.ice diff --git a/test-examples/Icestick/03-riscv-stop-watch/apio.ini b/test-examples/icestick/03-riscv-stop-watch/apio.ini similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/apio.ini rename to test-examples/icestick/03-riscv-stop-watch/apio.ini diff --git a/test-examples/Icestick/03-riscv-stop-watch/main.pcf b/test-examples/icestick/03-riscv-stop-watch/main.pcf similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/main.pcf rename to test-examples/icestick/03-riscv-stop-watch/main.pcf diff --git a/test-examples/Icestick/03-riscv-stop-watch/main.v b/test-examples/icestick/03-riscv-stop-watch/main.v similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/main.v rename to test-examples/icestick/03-riscv-stop-watch/main.v diff --git a/test-examples/Icestick/03-riscv-stop-watch/v5a4ee6.list b/test-examples/icestick/03-riscv-stop-watch/v5a4ee6.list similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/v5a4ee6.list rename to test-examples/icestick/03-riscv-stop-watch/v5a4ee6.list diff --git a/test-examples/Icestick/03-riscv-stop-watch/v771499.list b/test-examples/icestick/03-riscv-stop-watch/v771499.list similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/v771499.list rename to test-examples/icestick/03-riscv-stop-watch/v771499.list diff --git a/test-examples/Icestick/03-riscv-stop-watch/v9298ae.list b/test-examples/icestick/03-riscv-stop-watch/v9298ae.list similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/v9298ae.list rename to test-examples/icestick/03-riscv-stop-watch/v9298ae.list diff --git a/test-examples/Icestick/03-riscv-stop-watch/vba98fe.list b/test-examples/icestick/03-riscv-stop-watch/vba98fe.list similarity index 100% rename from test-examples/Icestick/03-riscv-stop-watch/vba98fe.list rename to test-examples/icestick/03-riscv-stop-watch/vba98fe.list diff --git a/test-examples/TinyFPGA-BX/01-LED-ON/01-LED-ON.ice b/test-examples/tinyfpga-bx/01-LED-ON/01-LED-ON.ice similarity index 100% rename from test-examples/TinyFPGA-BX/01-LED-ON/01-LED-ON.ice rename to test-examples/tinyfpga-bx/01-LED-ON/01-LED-ON.ice diff --git a/test-examples/TinyFPGA-BX/01-LED-ON/apio.ini b/test-examples/tinyfpga-bx/01-LED-ON/apio.ini similarity index 100% rename from test-examples/TinyFPGA-BX/01-LED-ON/apio.ini rename to test-examples/tinyfpga-bx/01-LED-ON/apio.ini diff --git a/test-examples/TinyFPGA-BX/01-LED-ON/main.pcf b/test-examples/tinyfpga-bx/01-LED-ON/main.pcf similarity index 100% rename from test-examples/TinyFPGA-BX/01-LED-ON/main.pcf rename to test-examples/tinyfpga-bx/01-LED-ON/main.pcf diff --git a/test-examples/TinyFPGA-BX/01-LED-ON/main.v b/test-examples/tinyfpga-bx/01-LED-ON/main.v similarity index 100% rename from test-examples/TinyFPGA-BX/01-LED-ON/main.v rename to test-examples/tinyfpga-bx/01-LED-ON/main.v diff --git a/test-examples/TinyFPGA-BX/02-jumping-LED/02-jumping-LED.ice b/test-examples/tinyfpga-bx/02-jumping-LED/02-jumping-LED.ice similarity index 100% rename from test-examples/TinyFPGA-BX/02-jumping-LED/02-jumping-LED.ice rename to test-examples/tinyfpga-bx/02-jumping-LED/02-jumping-LED.ice diff --git a/test-examples/TinyFPGA-BX/02-jumping-LED/apio.ini b/test-examples/tinyfpga-bx/02-jumping-LED/apio.ini similarity index 100% rename from test-examples/TinyFPGA-BX/02-jumping-LED/apio.ini rename to test-examples/tinyfpga-bx/02-jumping-LED/apio.ini diff --git a/test-examples/TinyFPGA-BX/02-jumping-LED/main.pcf b/test-examples/tinyfpga-bx/02-jumping-LED/main.pcf similarity index 100% rename from test-examples/TinyFPGA-BX/02-jumping-LED/main.pcf rename to test-examples/tinyfpga-bx/02-jumping-LED/main.pcf diff --git a/test-examples/TinyFPGA-BX/02-jumping-LED/main.v b/test-examples/tinyfpga-bx/02-jumping-LED/main.v similarity index 100% rename from test-examples/TinyFPGA-BX/02-jumping-LED/main.v rename to test-examples/tinyfpga-bx/02-jumping-LED/main.v diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/03-riscv-stop-watch.ice b/test-examples/tinyfpga-bx/03-riscv-stop-watch/03-riscv-stop-watch.ice similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/03-riscv-stop-watch.ice rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/03-riscv-stop-watch.ice diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/apio.ini b/test-examples/tinyfpga-bx/03-riscv-stop-watch/apio.ini similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/apio.ini rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/apio.ini diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/main.pcf b/test-examples/tinyfpga-bx/03-riscv-stop-watch/main.pcf similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/main.pcf rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/main.pcf diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/main.v b/test-examples/tinyfpga-bx/03-riscv-stop-watch/main.v similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/main.v rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/main.v diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/v5a4ee6.list b/test-examples/tinyfpga-bx/03-riscv-stop-watch/v5a4ee6.list similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/v5a4ee6.list rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/v5a4ee6.list diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/v771499.list b/test-examples/tinyfpga-bx/03-riscv-stop-watch/v771499.list similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/v771499.list rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/v771499.list diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/v9298ae.list b/test-examples/tinyfpga-bx/03-riscv-stop-watch/v9298ae.list similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/v9298ae.list rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/v9298ae.list diff --git a/test-examples/TinyFPGA-BX/03-riscv-stop-watch/vba98fe.list b/test-examples/tinyfpga-bx/03-riscv-stop-watch/vba98fe.list similarity index 100% rename from test-examples/TinyFPGA-BX/03-riscv-stop-watch/vba98fe.list rename to test-examples/tinyfpga-bx/03-riscv-stop-watch/vba98fe.list diff --git a/test/integration/test_examples.py b/test/integration/test_examples.py index 563244e7..87c2c49c 100644 --- a/test/integration/test_examples.py +++ b/test/integration/test_examples.py @@ -34,7 +34,7 @@ def test_examples(apio_runner: ApioRunner): # assert "Installing package 'examples'" in result.output # assert "Download" in result.output assert "Package 'examples' installed successfully" in result.output - assert getsize(sb.packages_dir / "examples/Alhambra-II/ledon/ledon.v") + assert getsize(sb.packages_dir / "examples/alhambra-ii/ledon/ledon.v") # -- List the examples result = sb.invoke_apio_cmd( @@ -42,44 +42,44 @@ def test_examples(apio_runner: ApioRunner): ["--list"], ) sb.assert_ok(result) - assert "Alhambra-II/ledon" in result.output + assert "alhambra-ii/ledon" in result.output # -- Fetch example files to current directory result = sb.invoke_apio_cmd( apio_examples, - ["--fetch-files", "Alhambra-II/ledon"], + ["--fetch-files", "alhambra-ii/ledon"], ) sb.assert_ok(result) - assert "Copying Alhambra-II/ledon example files" in result.output + assert "Copying alhambra-ii/ledon example files" in result.output assert "have been successfully created!" in result.output assert getsize("ledon.v") # -- Fetch example dir to current directory result = sb.invoke_apio_cmd( apio_examples, - ["--fetch-dir", "Alhambra-II/ledon"], + ["--fetch-dir", "alhambra-ii/ledon"], ) sb.assert_ok(result) - assert "Creating Alhambra-II/ledon directory" in result.output + assert "Creating alhambra-ii/ledon directory" in result.output assert "has been successfully created" in result.output - assert getsize("Alhambra-II/ledon/ledon.v") + assert getsize("alhambra-ii/ledon/ledon.v") # -- Fetch example files to another project dir result = sb.invoke_apio_cmd( apio_examples, - ["--fetch-files", "Alhambra-II/ledon", "--project-dir=./dir1"], + ["--fetch-files", "alhambra-ii/ledon", "--project-dir=./dir1"], ) sb.assert_ok(result) - assert "Copying Alhambra-II/ledon example files" in result.output + assert "Copying alhambra-ii/ledon example files" in result.output assert "have been successfully created!" in result.output assert getsize("dir1/ledon.v") # -- Fetch example dir to another project dir result = sb.invoke_apio_cmd( apio_examples, - ["--fetch-dir", "Alhambra-II/ledon", "--project-dir=dir2"], + ["--fetch-dir", "alhambra-ii/ledon", "--project-dir=dir2"], ) sb.assert_ok(result) - assert "Creating Alhambra-II/ledon directory" in result.output + assert "Creating alhambra-ii/ledon directory" in result.output assert "has been successfully created" in result.output - assert getsize("dir2/Alhambra-II/ledon/ledon.v") + assert getsize("dir2/alhambra-ii/ledon/ledon.v") diff --git a/test/integration/test_packages.py b/test/integration/test_packages.py index 8dc6b3db..3fa8f719 100644 --- a/test/integration/test_packages.py +++ b/test/integration/test_packages.py @@ -43,7 +43,7 @@ def test_packages(apio_runner: ApioRunner): result = sb.invoke_apio_cmd(apio_packages, ["--install", "examples"]) sb.assert_ok(result) assert "Package 'examples' installed successfully" in result.output - assert listdir(sb.packages_dir / "examples/Alhambra-II") + assert listdir(sb.packages_dir / "examples/alhambra-ii") assert "tools-oss-cad-suite" not in listdir(sb.packages_dir) # -- Install the reset of the packages. @@ -55,12 +55,12 @@ def test_packages(apio_runner: ApioRunner): assert ( "Package 'oss-cad-suite' installed successfully" in result.output ) - assert listdir(sb.packages_dir / "examples/Alhambra-II") + assert listdir(sb.packages_dir / "examples/alhambra-ii") assert listdir(sb.packages_dir / "tools-oss-cad-suite/bin") # -- Delete a file from the examples package, we will use it as an # -- indicator for the reinstallation of the package. - marker_file = sb.packages_dir / "examples/Alhambra-II/ledon/ledon.v" + marker_file = sb.packages_dir / "examples/alhambra-ii/ledon/ledon.v" assert marker_file.is_file() marker_file.unlink() assert not marker_file.exists() diff --git a/test/integration/test_projects.py b/test/integration/test_projects.py index 12ee673c..3dcdd6cf 100644 --- a/test/integration/test_projects.py +++ b/test/integration/test_projects.py @@ -115,7 +115,7 @@ def test_project_ice40(apio_runner: ApioRunner): """Tests building and testing an ice40 project.""" _test_project( apio_runner, - example="Alhambra-II/ledon", + example="alhambra-ii/ledon", testbench="ledon_tb", binary="hardware.bin", report_item="ICESTORM_LC:",