danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #52 from NixOS/remove-test-arch-hacks-builder

Browse source 
No longer strip x86_64-linux from test jobs
This commit is contained in:
Graham Christensen 2018-03-09 08:37:50 -05:00 committed by GitHub
parent fc322e1bd9 264a10bfee
commit 2408085bac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ofborg/src/tasks/build.rs
View file

@ -196,20 +196,6 @@ impl<'a, 'b> JobActions<'a, 'b> {
}
}
fn strip_x8664linux_arch_suffix(attr: &str) -> &str {
if !attr.starts_with("tests.") {
return attr;
}
if !attr.ends_with(".x86_64-linux") {
return attr;
}
let trim_at = attr.len() - 13;
return &attr[0..trim_at];
}
impl notifyworker::SimpleNotifyWorker for BuildWorker {
type J = buildjob::BuildJob;
@ -260,17 +246,6 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
_ => "./default.nix",
};
let attrs = match job.subset {
Some(commentparser::Subset::NixOS) => {
job.attrs
.clone()
.into_iter()
.map(|attr| strip_x8664linux_arch_suffix(&attr).to_owned())
.collect()
}
_ => job.attrs.clone(),
};
if buildfile == "./nixos/release.nix" && self.system == "x86_64-darwin" {
actions.nasty_hack_linux_only();
return;
@ -297,7 +272,7 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
let cmd = self.nix.safely_build_attrs_cmd(
refpath.as_ref(),
buildfile,
attrs,
job.attrs.clone(),
);
actions.log_started();
@ -458,21 +433,4 @@ mod tests {
assert_contains_job(&mut actions, "success\":true");
assert_eq!(actions.next(), Some(worker::Action::Ack));
}
#[test]
fn test_strip_x8664linux_arch_suffix() {
assert_eq!(strip_x8664linux_arch_suffix(""), "");
assert_eq!(
strip_x8664linux_arch_suffix("tests.foo.bar"),
"tests.foo.bar"
);
assert_eq!(
strip_x8664linux_arch_suffix("foo.bar.x86_64-linux"),
"foo.bar.x86_64-linux"
);
assert_eq!(
strip_x8664linux_arch_suffix("tests.foo.bar.x86_64-linux"),
"tests.foo.bar"
);
}
}