From 67404442a6cba7c0b42134234ec518f2ddcc6b51 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 12 Aug 2016 15:55:39 +0900
Subject: [PATCH] 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.
---
 addon-sdk/Makefile.in | 6 +++---
 addon-sdk/moz.build   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in
index 9e743de90da6..4ef3e5a73cd5 100644
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -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 \
diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build
index 72c481f70e48..ae6f68bc3552 100644
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -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 += [