Closed Bug 1284169 Opened 8 years ago Closed 8 years ago

assertion failed: GenerateCSSPropsGenerated.py did not list properties in nsCSSProperty order

Categories

(Core :: Layout, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla50
Tracking Status
firefox50 --- fixed

People

(Reporter: bmo, Assigned: bmo)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

In latest m-c trunk, when enabling mask shorthand properties in bug 1251161, we encountered below build failure[1].

layout/style/nsCSSPropsGenerated.inc:886:1: error: static assertion failed: GenerateCSSPropsGenerated.py did not list properties in nsCSSProperty order

The problem came from a patch in bug 1272488[2]. When trying to list CSS properties from nsCSSPropList.h, it didn't take flags in $(ACDEFINE) into account so that mask-* properties were not preprocessed and listed into final result to pass static assertions.

[1] https://treeherder.mozilla.org/#/jobs?repo=try&revision=680399f75c6b&selectedJob=23016508
[2] https://hg.mozilla.org/mozilla-central/rev/7ed69db97223
Depends on: 1272488
Blocks: mask-ship
Attachment #8767558 - Flags: review?(ted)
Attachment #8767558 - Flags: review?(mshal)
Blocks: 1283679
Comment on attachment 8767558 [details]
Bug 1284169 - include ACDEFINES flags in CSS properties PyGen

https://reviewboard.mozilla.org/r/62020/#review59176

This looks fine to me. Thanks for taking the time to fix it!
Attachment #8767558 - Flags: review?(mshal) → review+
Thanks for reviewing the patch.
The patch will be followed by a try and landed if we've got a green light.
Assignee: nobody → aschen
Status: NEW → ASSIGNED
Pushed by tlin@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/41313945285b
include ACDEFINES flags in CSS properties PyGen r=mshal
Blocks: mask-image
https://hg.mozilla.org/mozilla-central/rev/41313945285b
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla50
Attachment #8767558 - Flags: review?(ted)
With this patch my builds now fail:

/home/software/mozcom/obj/_virtualenv/bin/python -m mozbuild.action.file_generate /home/software/mozcom/mozilla/layout/style/GenerateCSSPropsGenerated.py generate nsCSSPropsGenerated.inc .deps/nsCSSPropsGenerated.inc.pp /home/software/mozcom/mozilla/layout/style/nsCSSPropsGenerated.inc.in /home/software/mozcom/mozilla/layout/style/PythonCSSProps.h
Traceback (most recent call last):
  File "/usr/lib/python2.7/runpy.py", line 162, in _run_module_as_main
    "__main__", fname, loader, pkg_name)
  File "/usr/lib/python2.7/runpy.py", line 72, in _run_code
    exec code in run_globals
  File "/home/software/mozcom/mozilla/python/mozbuild/mozbuild/action/file_generate.py", line 108, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/home/software/mozcom/mozilla/python/mozbuild/mozbuild/action/file_generate.py", line 63, in main
    ret = module.__dict__[method](output, *args.additional_arguments)
  File "/home/software/mozcom/mozilla/layout/style/GenerateCSSPropsGenerated.py", line 87, in generate
    properties = get_properties(preprocessorHeader)
  File "/home/software/mozcom/mozilla/layout/style/GenerateCSSPropsGenerated.py", line 14, in get_properties
    cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
KeyError: 'ACDEFINES'
make[4]: *** [nsCSSPropsGenerated.inc] Error 1
make[4]: *** Deleting file `nsCSSPropsGenerated.inc'
make[4]: Leaving directory `/home/software/mozcom/obj/layout/style'
make[3]: *** [layout/style/export] Error 2
(With that patch commented out, I get the failure originally reported in this bug.)
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: