Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Have workcache::test clean up after itself. #9204

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Have workcache::test put foo.c in the same directory it runs in.
This prevents a stray `foo.c` from being left lying around after tests
run, and it's more consistent with the rest of the code.
  • Loading branch information
lkuper committed Sep 16, 2013
commit a7515c87ae1352cb0009c4136f56092736012197
23 changes: 16 additions & 7 deletions src/libextra/workcache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,16 +496,23 @@ fn test() {
use std::io::WriterUtil;
use std::{os, run};

let pth = Path("foo.c");
// Create a path to a new file 'filename' in the directory in which
// this test is running.
fn make_path(filename: ~str) -> Path {
let pth = os::self_exe_path().expect("workcache::test failed").pop().push(filename);
if os::path_exists(&pth) {
os::remove_file(&pth);
}
return pth;
}

let pth = make_path(~"foo.c");
{
let r = io::file_writer(&pth, [io::Create]);
r.unwrap().write_str("int main() { return 0; }");
}

let db_path = os::self_exe_path().expect("workcache::test failed").pop().push("db.json");
if os::path_exists(&db_path) {
os::remove_file(&db_path);
}
let db_path = make_path(~"db.json");

let cx = Context::new(RWArc::new(Database::new(db_path)),
RWArc::new(Logger::new()),
Expand All @@ -514,17 +521,19 @@ fn test() {
let s = do cx.with_prep("test1") |prep| {

let subcx = cx.clone();
let pth = pth.clone();

prep.declare_input("file", pth.to_str(), digest_file(&pth));
do prep.exec |_exe| {
let out = Path("foo.o");
run::process_status("gcc", [~"foo.c", ~"-o", out.to_str()]);
let out = make_path(~"foo.o");
run::process_status("gcc", [pth.to_str(), ~"-o", out.to_str()]);

let _proof_of_concept = subcx.prep("subfn");
// Could run sub-rules inside here.

out.to_str()
}
};

io::println(s);
}