From 5421bc294268d4cb24c036710f60adeeae1ed1c9 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 15 May 2013 15:59:58 -0700 Subject: rustpkg: Reorganize test files --- .../pass/src/deeply/nested/path/foo/main.rs | 17 +++++++++++++++++ .../pass/src/deeply/nested/path/foo/src/main.rs | 17 ----------------- .../testsuite/pass/src/external-crate/main.rs | 21 +++++++++++++++++++++ .../testsuite/pass/src/external-crate/src/main.rs | 21 --------------------- 4 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/main.rs delete mode 100644 src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/src/main.rs create mode 100644 src/librustpkg/testsuite/pass/src/external-crate/main.rs delete mode 100644 src/librustpkg/testsuite/pass/src/external-crate/src/main.rs (limited to 'src') diff --git a/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/main.rs b/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/main.rs new file mode 100644 index 00000000000..62785c06db3 --- /dev/null +++ b/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/main.rs @@ -0,0 +1,17 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +/* +The test runner should check that, after `rustpkg install deeply/nested/path/foo`: + with RUST_PATH undefined in the environment: + * ./deeply/nested/path/foo exists and is an executable +*/ + +fn main() {} diff --git a/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/src/main.rs b/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/src/main.rs deleted file mode 100644 index 62785c06db3..00000000000 --- a/src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/src/main.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -/* -The test runner should check that, after `rustpkg install deeply/nested/path/foo`: - with RUST_PATH undefined in the environment: - * ./deeply/nested/path/foo exists and is an executable -*/ - -fn main() {} diff --git a/src/librustpkg/testsuite/pass/src/external-crate/main.rs b/src/librustpkg/testsuite/pass/src/external-crate/main.rs new file mode 100644 index 00000000000..d094bcd6bba --- /dev/null +++ b/src/librustpkg/testsuite/pass/src/external-crate/main.rs @@ -0,0 +1,21 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +/* +The test runner should check that, after `rustpkg install external crate` + with RUST_PATH undefined in the environment + and with `rustpkg install deeply/nested/path/foo` already + executed: + * ./.rust/external_crate exists and is an executable +*/ + +extern mod foo; // refers to deeply/nested/path/foo + +fn main() {} diff --git a/src/librustpkg/testsuite/pass/src/external-crate/src/main.rs b/src/librustpkg/testsuite/pass/src/external-crate/src/main.rs deleted file mode 100644 index d094bcd6bba..00000000000 --- a/src/librustpkg/testsuite/pass/src/external-crate/src/main.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -/* -The test runner should check that, after `rustpkg install external crate` - with RUST_PATH undefined in the environment - and with `rustpkg install deeply/nested/path/foo` already - executed: - * ./.rust/external_crate exists and is an executable -*/ - -extern mod foo; // refers to deeply/nested/path/foo - -fn main() {} -- cgit 1.4.1-3-g733a5 From e732912954c480d435d2760c259a44cf8837ac55 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 15 May 2013 16:15:26 -0700 Subject: rustpkg: ignore tests on i686, since they fail --- src/librustpkg/tests.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs index 487e8d0da36..8eba3f06de3 100644 --- a/src/librustpkg/tests.rs +++ b/src/librustpkg/tests.rs @@ -93,7 +93,9 @@ fn test_sysroot() -> Path { self_path.pop() } +// Ignored on i686 -- see #6517 #[test] +#[ignore(cfg(target_arch = "x86"))] fn test_make_dir_rwx() { let temp = &os::tmpdir(); let dir = temp.push(~"quux"); @@ -107,6 +109,7 @@ fn test_make_dir_rwx() { } #[test] +#[ignore(cfg(target_arch = "x86"))] fn test_install_valid() { let sysroot = test_sysroot(); debug!("sysroot = %s", sysroot.to_str()); @@ -132,6 +135,7 @@ fn test_install_valid() { } #[test] +#[ignore(cfg(target_arch = "x86"))] fn test_install_invalid() { use conditions::nonexistent_package::cond; use cond1 = conditions::missing_pkg_files::cond; @@ -154,6 +158,7 @@ fn test_install_invalid() { } #[test] +#[ignore(cfg(target_arch = "x86"))] fn test_install_url() { let workspace = mkdtemp(&os::tmpdir(), "test").expect("couldn't create temp dir"); let sysroot = test_sysroot(); -- cgit 1.4.1-3-g733a5