From aab976d839beada7d9e63e52fa40d2fef41acb19 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Jul 2021 00:56:07 +0100 Subject: [PATCH] wdriver: Introduce firefox-wrapper Signed-off-by: Ian Jackson --- Makefile | 2 +- wdriver/firefox-wrapper | 3 +++ wdriver/wdriver.rs | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100755 wdriver/firefox-wrapper diff --git a/Makefile b/Makefile index ced38ac4..36f13aaf 100644 --- a/Makefile +++ b/Makefile @@ -421,7 +421,7 @@ AT_DEPS = $(filter-out templates/script.js, $(RUNTEST_DEPS)) \ examples/big-bundle.zip \ stamp/cargo-at.debug -WDT_DEPS = $(RUNTEST_DEPS) \ +WDT_DEPS = $(RUNTEST_DEPS) wdriver/firefox-wrapper \ stamp/cargo-wdt.debug AT_WDT_RUN = $(NAILING_CARGO_JUST_RUN) $(abspath $<) diff --git a/wdriver/firefox-wrapper b/wdriver/firefox-wrapper new file mode 100755 index 00000000..5e0b2935 --- /dev/null +++ b/wdriver/firefox-wrapper @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +exec firefox "$@" diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs index 259e2efe..a4611469 100644 --- a/wdriver/wdriver.rs +++ b/wdriver/wdriver.rs @@ -118,9 +118,11 @@ fn prepare_xserver(cln: &cleanup_notify::Handle, ds: &DirSubst) { } #[throws(AE)] -fn prepare_geckodriver(opts: &Opts, cln: &cleanup_notify::Handle) { +fn prepare_geckodriver(opts: &Opts, ds: &DirSubst, + cln: &cleanup_notify::Handle) { const EXPECTED: &str = "Listening on 127.0.0.1:4444"; let mut cmd = Command::new("geckodriver"); + cmd.args(&["--binary", &ds.subst("@src@/wdriver/firefox-wrapper")?]); if opts.geckodriver_args != "" { cmd.args(opts.geckodriver_args.split(' ')); } @@ -825,7 +827,7 @@ pub fn setup(exe_module_path: &str) -> (Setup, Instance) { let final_hook = FinalInfoCollection; - prepare_geckodriver(&opts, &core.cln).did("setup webdriver server")?; + prepare_geckodriver(&opts, &core.ds, &core.cln).did("setup webdriverr")?; let (driver, screenshot_count, windows_squirreled) = prepare_thirtyfour(&core.ds).did("prepare web session")?; -- 2.30.2