user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak Travis to use GCE

Browse source 
Travis CI has new infrastructure using the Google Compute Engine which has both
faster CPUs and more memory, and we've been encouraged to switch as it should
help our build times! The only downside currently, however, is that IPv6 is
disabled, causing a number of standard library tests to fail.

Consequently this commit tweaks our travis config in a few ways:

* ccache is disabled as it's not working on GCE just yet
* Docker is used to run tests inside which reportedly will get IPv6 working
* A system LLVM installation is used instead of building LLVM itself. This is
  primarily done to reduce build times, but we want automation for this sort of
  behavior anyway and we can extend this in the future with building from source
  as well if needed.
* gcc-specific logic is removed as the docker image for Ubuntu gives us a
  recent-enough gcc by default.
This commit is contained in:
Alex Crichton 2015-09-18 10:19:23 -07:00
parent 19fe7b6d64
commit 27dd6dd3db
8 changed files with 80 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/test/run-pass/core-run-destroy.rs
View file

@ -30,26 +30,25 @@ macro_rules! t {
($e:expr) => (match $e { Ok(e) => e, Err(e) => panic!("error: {}", e) })
}
#[test]
fn test_destroy_once() {
let mut p = sleeper();
match p.kill() {
Ok(()) => {}
Err(e) => panic!("error: {}", e),
}
t!(p.kill());
}
#[cfg(unix)]
pub fn sleeper() -> Child {
Command::new("sleep").arg("1000").spawn().unwrap()
t!(Command::new("sleep").arg("1000").spawn())
}
#[cfg(windows)]
pub fn sleeper() -> Child {
// There's a `timeout` command on windows, but it doesn't like having
// its output piped, so instead just ping ourselves a few times with
// gaps in between so we're sure this process is alive for awhile
Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn().unwrap()
t!(Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn())
}
#[test]
fn test_destroy_twice() {
let mut p = sleeper();
t!(p.kill()); // this shouldn't crash...
@ -58,21 +57,20 @@ fn test_destroy_twice() {
#[test]
fn test_destroy_actually_kills() {
#[cfg(all(unix,not(target_os="android")))]
static BLOCK_COMMAND: &'static str = "cat";
#[cfg(all(unix,target_os="android"))]
static BLOCK_COMMAND: &'static str = "/system/bin/cat";
#[cfg(windows)]
static BLOCK_COMMAND: &'static str = "cmd";
let cmd = if cfg!(windows) {
"cmd"
} else if cfg!(target_os = "android") {
"/system/bin/cat"
} else {
"cat"
};
// this process will stay alive indefinitely trying to read from stdin
let mut p = Command::new(BLOCK_COMMAND)
.stdin(Stdio::piped())
.spawn().unwrap();
let mut p = t!(Command::new(cmd)
.stdin(Stdio::piped())
.spawn());
p.kill().unwrap();
t!(p.kill());
// Don't let this test time out, this should be quick
let (tx, rx) = channel();
@ -82,7 +80,7 @@ fn test_destroy_actually_kills() {
process::exit(1);
}
});
let code = p.wait().unwrap().code();
let code = t!(p.wait()).code();
if cfg!(windows) {
assert!(code.is_some());
} else {