aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2016-04-04 19:23:06 -0500
committerAlan Jeffrey <ajeffrey@mozilla.com>2016-04-04 19:23:06 -0500
commit8cc04913f7b4dec0490627aa06af0ac631e20091 (patch)
tree87b88231f8af4aa93c21f9b366a0289cdffb3442
parentd35ae3beb73158ec4c9ab20b3361e948379a4c90 (diff)
downloadservo-8cc04913f7b4dec0490627aa06af0ac631e20091.tar.gz
servo-8cc04913f7b4dec0490627aa06af0ac631e20091.zip
Added --soft-fail option.
-rw-r--r--components/util/opts.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/util/opts.rs b/components/util/opts.rs
index a5799883e14..590a097068b 100644
--- a/components/util/opts.rs
+++ b/components/util/opts.rs
@@ -532,6 +532,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
"A user stylesheet to be added to every document", "file.css");
opts.optflag("z", "headless", "Headless mode");
opts.optflag("f", "hard-fail", "Exit on thread failure instead of displaying about:failure");
+ opts.optflag("F", "soft-fail", "Display about:failure on thread failure instead of exiting");
opts.optflagopt("", "devtools", "Start remote devtools server on port", "6000");
opts.optflagopt("", "webdriver", "Start remote WebDriver server on port", "7000");
opts.optopt("", "resolution", "Set window resolution.", "800x600");
@@ -756,7 +757,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
gc_profile: debug_options.gc_profile,
load_webfonts_synchronously: debug_options.load_webfonts_synchronously,
headless: opt_match.opt_present("z"),
- hard_fail: opt_match.opt_present("f"),
+ hard_fail: opt_match.opt_present("f") && !opt_match.opt_present("F"),
bubble_inline_sizes_separately: bubble_inline_sizes_separately,
profile_script_events: debug_options.profile_script_events,
profile_heartbeats: debug_options.profile_heartbeats,