Skip to content
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

Fix qstr error #6047

Merged
merged 2 commits into from
Feb 17, 2022
Merged

Fix qstr error #6047

merged 2 commits into from
Feb 17, 2022

Conversation

jepler
Copy link
Member

@jepler jepler commented Feb 17, 2022

Dan noticed that builds were printing a scary message like

../../supervisor/shared/translate.c:90:10: error: "compress_max_length_bits" is not defined, evaluates to 0 [-Werror=undef]
   90 |     #if (compress_max_length_bits <= 8)
      |          ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Command '['arm-none-eabi-gcc', '-E', '-DNO_QSTR', ..., '../supervisor/shared/translate.c']' returned non-zero exit status 1.
make: *** [../../py/mkrules.mk:100: build-adafruit_feather_rp2040/genhdr/qstr.split] Error 1

but continuing, apparently, just fine. This two part PR:

  • makes the scary message be followed by an actual error that stops make
  • fixes the original problem, which was harmless but wouldn't have been allowed to creep in if not for the first problem

Due to a number of problems, an error calling the preprocessor wasn't
making the whole genlast process fail.

Now, after an execption during preprocess is printed, it is re-raised.
Then, by actually collating the results of executor.map, the exception
will be raised in the main thread context. Any CalledProcessError is simply
converted to a nonzero exit status.
@jepler jepler requested a review from dhalbert February 17, 2022 14:41
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Builds are working.

@dhalbert dhalbert merged commit 16c44a4 into adafruit:main Feb 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants