From c3e04fb1e58d80fa18d40684391a99a840c6a91c Mon Sep 17 00:00:00 2001
From: David Burns <dburns@mozilla.com>
Date: Mon, 9 Oct 2017 21:09:09 +0100
Subject: [PATCH] Bug 1374263 - Make sure build places geckodriver binary in
correct directory. r=froydnj
The geckodriver binary is not being moved to correct directory which is required
to be able to run web platform tests successfully.
MozReview-Commit-ID: HTxnACX2FLR
--HG--
extra : rebase_source : 816dc27bfad7d9e93ca1074f9ab05ba1c0bb578b
---
browser/app/Makefile.in | 2 +-
browser/app/macbuild/Contents/MacOS-files.in | 3 +++
browser/app/moz.build | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index bdae83a868db0..df4a2c8c1ca07 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -47,7 +47,7 @@ include $(topsrcdir)/config/rules.mk
ifneq (,$(filter-out WINNT,$(OS_ARCH)))
ifdef COMPILE_ENVIRONMENT
-libs::
+libs::
cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in
index e744c743b7f77..bd87bc5116b79 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -2,6 +2,9 @@
/*.dylib
/certutil
/firefox-bin
+#if defined(MOZ_GECKODRIVER)
+/geckodriver
+#endif
/gtest/***
#if defined(MOZ_ASAN) || defined(MOZ_TSAN)
/llvm-symbolizer
diff --git a/browser/app/moz.build b/browser/app/moz.build
index f6d65d89f7229..bae53000c3bf0 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -62,6 +62,9 @@ if CONFIG['LIBFUZZER']:
'/tools/fuzzing/libfuzzer',
]
+if CONFIG['ENABLE_GECKODRIVER']:
+ DEFINES['MOZ_GECKODRIVER'] = True
+
if CONFIG['_MSC_VER']:
# Always enter a Windows program through wmain, whether or not we're
# a console application.
--
GitLab