Skip to content

qemu-arm/qemu-riscv: consolidate Makefile.test into main Makefile #15577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

dpgeorge
Copy link
Member

@dpgeorge dpgeorge commented Aug 1, 2024

Summary

Currently, the qemu-arm and qemu-riscv ports have separate Makefile.test files needed to build and run the tests. It's a bit awkward (and unconventional within this project) to have to run make -f Makefile.test test to run the tests.

The files don't really need to be separate, and this PR consolidates Makefile.test into the main Makefile.

Now the tests are run simply with make test.

Testing

Locally ran make test and it had the same output as before doing make -f Makefile.test test.

CI is also updated to work with this new, simplified make target.

Trade-offs and Alternatives

The alternative is to leave it as-is, but I think this change makes it simpler, easier to understand, and more like other ports (which only have one Makefile).

Signed-off-by: Damien George <damien@micropython.org>
@dpgeorge dpgeorge added the ports Relates to multiple ports, or a new/proposed port label Aug 1, 2024
Copy link

codecov bot commented Aug 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.43%. Comparing base (d1685a3) to head (d2de1bb).

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #15577   +/-   ##
=======================================
  Coverage   98.43%   98.43%           
=======================================
  Files         161      161           
  Lines       21281    21281           
=======================================
  Hits        20948    20948           
  Misses        333      333           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

github-actions bot commented Aug 1, 2024

Code size report:

   bare-arm:    +0 +0.000% 
minimal x86:    +0 +0.000% 
   unix x64:    +0 +0.000% standard
      stm32:    +0 +0.000% PYBV10
     mimxrt:    +0 +0.000% TEENSY40
        rp2:    +0 +0.000% RPI_PICO_W
       samd:    +0 +0.000% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Signed-off-by: Damien George <damien@micropython.org>
@dpgeorge dpgeorge force-pushed the ports-qemu-simplify-makefile branch from 248101b to d2de1bb Compare August 1, 2024 03:22
@agatti
Copy link
Contributor

agatti commented Aug 1, 2024

Out of curiosity, wouldn't the powerpc port need to be renamed to qemu-powerpc and have similar build machinery set up to run tests?

@dpgeorge
Copy link
Member Author

dpgeorge commented Aug 2, 2024

wouldn't the powerpc port need to be renamed to qemu-powerpc

The powerpc port was intended to be a proper, generic PowerPC port. But it never really got off the ground.

@dpgeorge
Copy link
Member Author

Closing in favour of #15624.

@dpgeorge dpgeorge closed this Aug 12, 2024
@dpgeorge dpgeorge deleted the ports-qemu-simplify-makefile branch August 12, 2024 02:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ports Relates to multiple ports, or a new/proposed port
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants