Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4702 : shinglyu/servo/bug3219, r=jdm

Browse source 
This is a fix for bug #3219 . This patch allows the user to specify a disposiable hostfile using the `HOST_FILE` environment variable. Therefore, we can run tests on test servers without actually changing the system hostfile.
This commit is contained in:
bors-servo 2015-02-05 20:30:45 -07:00
commit 237cdee9e4
2 changed files with 102 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/servo/main.rs
View file

@ -12,6 +12,7 @@ extern crate libc;
extern crate servo;
extern crate time;
extern crate util;
extern crate "net" as servo_net;
#[cfg(not(test))]
extern crate "glutin_app" as app;
@ -29,6 +30,9 @@ use libc::c_int;
#[cfg(not(test))]
use util::opts;
#[cfg(not(test))]
use servo_net::resource_task;
#[cfg(not(test))]
use servo::Browser;
#[cfg(not(test))]
@ -113,6 +117,7 @@ fn setup_logging() {
fn main() {
if opts::from_cmdline_args(get_args().as_slice()) {
setup_logging();
resource_task::global_init();
let window = if opts::get().headless {
None