diff mbox series

[PATCH-for-8.2] tests/avocado: Stop fetching yamon-bin-02.22.zip

Message ID 20231201142139.39816-1-philmd@linaro.org
State New
Headers show
Series [PATCH-for-8.2] tests/avocado: Stop fetching yamon-bin-02.22.zip | expand

Commit Message

Philippe Mathieu-Daudé Dec. 1, 2023, 2:21 p.m. UTC 
Per https://mips.com/develop/tools/boot-loaders/:

  To support existing users of these, and the QEMU project,
  YAMON is now available under the GPL License.

However the link https://mips.com/downloads/yamon-version-02-22/
is invalid:

  > GET /tools/mips-tools/downloads/yamon/yamon-bin-02.22.zip HTTP/1.1
  > Host: www.imgtec.com
  >
  < HTTP/1.1 301 Moved Permanently

Stop fetching the archive, use a patch to a downloaded one.

When YAMON_02_22_ZIP_PATH is not set we get:

   (4/4) tests/avocado/machine_mips_malta.py:MaltaMachineYamon.test_mips64el_malta_yamon: SKIP: YAMON_02_22_ZIP_PATH not available

Otherwise we keep testing:

   (4/4) tests/avocado/machine_mips_malta.py:MaltaMachineYamon.test_mips64el_malta_yamon:
  console: YAMON ROM Monitor, Revision 02.22.
  console: Copyright (c) 1999-2007 MIPS Technologies, Inc. - All Rights Reserved.
  console: For a list of available commands, type 'help'.
  console: Compilation time =              May 24 2013  12:16:34 (pburton)
  console: Board type/revision =           0x02 (Malta) / 0x00
  console: Core board type/revision =      0x01 (CoreLV) / 0x00
  console: System controller/revision =    Galileo / GT_64120A-B-0
  console: FPGA revision =                 0x0000
  console: MAC address =                   ff.ff.ff.ff.ff.ff
  console: Board S/N =                     0123456789
  console: PCI bus frequency =             33.33 MHz
  console: Processor Company ID/options =  0x01 (MIPS Technologies, Inc.) / 0x00
  console: Processor ID/revision =         0x82 (MIPS 20Kc) / 0xa0
  console: Endianness =                    Little
  console: CPU/Bus frequency =             320 MHz / 419 MHz
  console: Coherency =                     None
  console: Flash memory size =             4 MByte
  console: SDRAM size =                    128 MByte
  console: First free SDRAM address =      0x800c3300
  console: WARNING: Environment variable flash area is invalid!
  console: HINT   : Perform "erase -e"
  console: YAMON>
  PASS (3.50 s)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Supersedes: <20231201093633.2551497-5-alex.bennee@linaro.org>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: BALATON Zoltan <balaton@eik.bme.hu>
---
 tests/avocado/machine_mips_malta.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py
index 9bd54518bf..7f82f3abba 100644
--- a/tests/avocado/machine_mips_malta.py
+++ b/tests/avocado/machine_mips_malta.py
@@ -121,13 +121,16 @@  def test_mips_malta_i6400_framebuffer_logo_8cores(self):
         """
         self.do_test_i6400_framebuffer_logo(8)
 
-class MaltaMachine(QemuSystemTest):
+@skipUnless(os.getenv('YAMON_02_22_ZIP_PATH'),
+            'YAMON_02_22_ZIP_PATH not available')
+class MaltaMachineYamon(QemuSystemTest):
 
     def do_test_yamon(self):
         rom_url = ('http://www.imgtec.com/tools/mips-tools/downloads/'
                    'yamon/yamon-bin-02.22.zip')
         rom_hash = '8da7ecddbc5312704b8b324341ee238189bde480'
-        zip_path = self.fetch_asset(rom_url, asset_hash=rom_hash)
+        zip_path = os.getenv('YAMON_02_22_ZIP_PATH')
+        zip_path = self.fetch_asset(f'file://{zip_path}', asset_hash=rom_hash)
 
         archive.extract(zip_path, self.workdir)
         yamon_path = os.path.join(self.workdir, 'yamon-02.22.bin')