Bug 1374263 - Make sure build places geckodriver binary in correct directory. r=froydnj
authorDavid Burns <dburns@mozilla.com>
Mon, 09 Oct 2017 21:09:09 +0100
changeset 679123 1435d1f7db3be98cd3a3bf72d5307045b16ab862
parent 679122 7290aaeb80740ceced351d10507b3bfdf0807aea
child 679124 c2bb5a120db9b3e9b0fca315610efd6643962ee0
push id84141
push userbmo:schien@mozilla.com
push dateThu, 12 Oct 2017 11:13:04 +0000
reviewersfroydnj
bugs1374263
milestone58.0a1
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
browser/app/Makefile.in
browser/app/macbuild/Contents/MacOS-files.in
browser/app/moz.build
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -42,17 +42,17 @@ endif
 
 PROGRAMS_DEST = $(DIST)/bin
 
 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
 
 GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
 
 endif
 
 # channel-prefs.js is handled separate from other prefs due to bug 756325
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -1,12 +1,15 @@
 /*.app/***
 /*.dylib
 /certutil
 /firefox-bin
+#if defined(MOZ_GECKODRIVER)
+/geckodriver
+#endif
 /gtest/***
 #if defined(MOZ_ASAN) || defined(MOZ_TSAN)
 /llvm-symbolizer
 #endif
 /pingsender
 /pk12util
 /ssltunnel
 /webrtc-gtest
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -57,16 +57,19 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG['LIBFUZZER']:
     USE_LIBS += [ 'fuzzer' ]
     LOCAL_INCLUDES += [
         '/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.
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     RCINCLUDE = 'splash.rc'
     DEFINES['MOZ_PHOENIX'] = True