mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 21:01:08 +00:00
Bug 1256004 - Create the addon-sdk test addons directly under addon-sdk. r=gps
Instead of creating them in a subdirectory, possibly racing over the creation of said subdirectory, just create them in the existing current directory. They're being copied over to some other place anyways, they just have to be picked from the right location when doing so.
This commit is contained in:
parent
3f3d75fb1f
commit
67404442a6
@ -5,11 +5,11 @@
|
||||
TESTADDONS = source/test/addons
|
||||
ADDONSRC = $(srcdir)/$(TESTADDONS)
|
||||
|
||||
sinclude $(topsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# This can switch to just zipping the files when native jetpacks land
|
||||
$(TESTADDONS)/%.xpi: FORCE $(call mkdir_deps,$(CURDIR)/$(TESTADDONS)) $(ADDONSRC)/%
|
||||
$(PYTHON) $(srcdir)/source/bin/cfx xpi --no-strip-xpi --pkgdir=$(lastword $^) --output-file=$@
|
||||
%.xpi: FORCE
|
||||
$(PYTHON) $(srcdir)/source/bin/cfx xpi --no-strip-xpi --pkgdir=$(ADDONSRC)/$* --output-file=$@
|
||||
|
||||
TEST_FILES = \
|
||||
$(srcdir)/source/app-extension \
|
||||
|
@ -60,7 +60,7 @@ addons = [
|
||||
'unsafe-content-script',
|
||||
]
|
||||
|
||||
addons = ['source/test/addons/%s.xpi' % f for f in addons]
|
||||
addons = ['%s.xpi' % f for f in addons]
|
||||
GENERATED_FILES += addons
|
||||
|
||||
TEST_HARNESS_FILES.testing.mochitest['jetpack-addon']['addon-sdk'].source.test.addons += [
|
||||
|
Loading…
Reference in New Issue
Block a user