Skip to content

Commit 329bdb1

Browse files
committed
---
yaml --- r: 55815 b: refs/heads/master c: f945e57 h: refs/heads/master i: 55813: e7150dc 55811: 309200c 55807: f9800c5 v: v3
1 parent 3778a4b commit 329bdb1

File tree

10 files changed

+12
-7
lines changed

10 files changed

+12
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6a3e26aa4062019629e144196a7852ef039f8b0a
2+
refs/heads/master: f945e57bd050227bbf92f151303785991173f2fe
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/src/librustpkg/testsuite/pass/src/fancy-lib/src/fancy-lib.rs renamed to trunk/src/librustpkg/testsuite/pass/src/fancy-lib/fancy-lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ extern mod std;
2121

2222
pub mod foo;
2323
pub mod bar;
24-
#[path = "build/generated.rs"] pub mod generated;
24+
#[path = "../../build/fancy_lib/generated.rs"] pub mod generated;

trunk/src/librustpkg/testsuite/pass/src/fancy-lib/pkg.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@
1111
use core::run;
1212

1313
pub fn main() {
14-
let cwd = os::getcwd();
15-
debug!("cwd = %s", cwd.to_str());
16-
let file = io::file_writer(&Path(~"fancy-lib/build/generated.rs"),
14+
use core::libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};
15+
16+
let out_path = Path(~"build/fancy_lib");
17+
if !os::path_exists(&out_path) {
18+
assert!(os::make_dir(&out_path, (S_IRUSR | S_IWUSR | S_IXUSR) as i32));
19+
}
20+
21+
let file = io::file_writer(&out_path.push("generated.rs"),
1722
[io::Create]).get();
1823
file.write_str("pub fn wheeeee() { for [1, 2, 3].each() |_| { assert!(true); } }");
1924

2025
// now compile the crate itself
21-
run::run_program("rustc", ~[~"fancy-lib/fancy-lib.rs", ~"--lib",
22-
~"-o", ~"fancy-lib/build/fancy_lib"]);
26+
run::run_program("rustc", ~[~"src/fancy-lib/fancy-lib.rs", ~"--lib",
27+
~"-o", out_path.push(~"fancy_lib").to_str()]);
2328
}

0 commit comments

Comments
 (0)