Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix running servoshell and unit tests through a symlink (#30537)

Browse source 
* Fix running servoshell and unit tests through a symlink

* make filename an inherent method of Resource

* fix mach test-unit behaviour through symlink

* unit tests only need current_dir and ancestors

* fix macOS package smoketest breakage
This commit is contained in:
Delan Azabani 2023-10-18 18:33:51 +08:00 • committed by GitHub
parent 8a12b4c957
commit 351b5036bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 130 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ports/servoshell/prefs.rs
View file

@ -6,10 +6,9 @@ use std::collections::HashMap;
use std::fs::File;
use std::io::Read;
use getopts::{Matches, Options};
use servo::config::opts::{self, ArgumentParsingResult};
use getopts::Matches;
use servo::config::opts;
use servo::config::prefs::{self, PrefValue};
use servo::embedder_traits;
use servo::servo_config::basedir;
pub fn register_user_prefs(opts_matches: &Matches) {
@ -61,16 +60,15 @@ pub fn register_user_prefs(opts_matches: &Matches) {
prefs::add_user_prefs(userprefs);
}
// Use for test
#[allow(dead_code)]
#[cfg(test)]
fn test_parse_pref(arg: &str) {
embedder_traits::resources::set_for_tests();
let mut opts = Options::new();
servo::embedder_traits::resources::set_for_tests();
let mut opts = getopts::Options::new();
opts.optmulti("", "pref", "", "");
let args = vec!["servo".to_string(), "--pref".to_string(), arg.to_string()];
let matches = match opts::from_cmdline_args(opts, &args) {
ArgumentParsingResult::ContentProcess(m, _) => m,
ArgumentParsingResult::ChromeProcess(m) => m,
opts::ArgumentParsingResult::ContentProcess(m, _) => m,
opts::ArgumentParsingResult::ChromeProcess(m) => m,
};
register_user_prefs(&matches);
}