Closed
Bug 885019
Opened 12 years ago
Closed 12 years ago
Move GTEST_CPPSRCS to moz.build
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla25
People
(Reporter: gps, Assigned: bokeefe)
References
(Blocks 1 open bug)
Details
Attachments
(1 file, 3 obsolete files)
10.60 KB,
patch
|
gps
:
review+
|
Details | Diff | Splinter Review |
GTEST_CPPSRCS needs to be moved to moz.build files. This is a new variable and I'd rather nip this one before it buds.
Assignee | ||
Comment 1•12 years ago
|
||
Since there were only the two Makefile.ins, I didn't bother splitting this into two parts. I also moved GTEST_CSRCS and GTEST_CMMSRCS while I was at it, not that they're used anywhere just yet.
This will end up conflicting with the patch for bug 864441, whenever that's ready.
If we do something like in bug 864774 comment 48, it might be worth doing something similar with these variables as well.
Assignee | ||
Comment 2•12 years ago
|
||
> This will end up conflicting with the patch for bug 864441, whenever that's
> ready.
Namely, now. I've updated the patch.
Attachment #766461 -
Attachment is obsolete: true
Attachment #766461 -
Flags: review?(gps)
Attachment #767344 -
Flags: review?(gps)
Comment 3•12 years ago
|
||
Thanks
Reporter | ||
Comment 4•12 years ago
|
||
Comment on attachment 767344 [details] [diff] [review]
Move GTEST_CPPSRCS, GTEST_CMMSRCS, and GTEST_CSRCS to moz.build files
Review of attachment 767344 [details] [diff] [review]:
-----------------------------------------------------------------
r+ conditional on ensuring js/src/config/rules.mk is in sync with config/rules.mk.
::: js/src/config/rules.mk
@@ +16,5 @@
> # responsibility between Makefile.in and mozbuild files.
> _MOZBUILD_EXTERNAL_VARIABLES := \
> DIRS \
> EXTRA_PP_COMPONENTS \
> + GTEST_CPPSRCS \
Unless splinter is lying to me, this file differs from /config/rules.mk and thus will break check-sync-dirs at the top of the build.
Attachment #767344 -
Flags: review?(gps) → review+
Assignee | ||
Comment 5•12 years ago
|
||
(In reply to Gregory Szorc [:gps] from comment #4)
> Unless splinter is lying to me, this file differs from /config/rules.mk and
> thus will break check-sync-dirs at the top of the build.
I would manage to forget that.
Attachment #767344 -
Attachment is obsolete: true
Attachment #767714 -
Flags: review+
Assignee | ||
Updated•12 years ago
|
Keywords: checkin-needed
Comment 6•12 years ago
|
||
Flags: in-testsuite+
Keywords: checkin-needed
Comment 7•12 years ago
|
||
Assignee | ||
Comment 8•12 years ago
|
||
> gfx/tests/gtest/moz.build
>if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
> GTEST_CPP_SOURCES += [
> 'TestBase.cpp'
> 'TestMoz2D.cpp'
> 'TestPoint.cpp'
> 'TestScaling.cpp'
> ]
I missed a few commas here, evidently.
Attachment #767714 -
Attachment is obsolete: true
Attachment #767799 -
Flags: review?(gps)
Reporter | ||
Updated•12 years ago
|
Attachment #767799 -
Flags: review?(gps) → review+
Assignee | ||
Updated•12 years ago
|
Keywords: checkin-needed
Comment 9•12 years ago
|
||
Keywords: checkin-needed
Comment 10•12 years ago
|
||
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla25
Comment 11•12 years ago
|
||
Will GTEST_CPPSRCS be rejected? Well need to update the GTest page:
https://developer.mozilla.org/en-US/docs/GTest#Adding_a_test_to_the_build_system
Assignee | ||
Comment 12•12 years ago
|
||
(In reply to Benoit Girard (:BenWa) from comment #11)
> Will GTEST_CPPSRCS be rejected? Well need to update the GTest page:
> https://developer.mozilla.org/en-US/docs/
> GTest#Adding_a_test_to_the_build_system
Yes, specifying GTEST_CPPSRCS (or _CSRS or _CMMSRCS) in Makefile.ins is an error now. I updated the GTest page.
Updated•7 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•