From 5421bc294268d4cb24c036710f60adeeae1ed1c9 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 15 May 2013 15:59:58 -0700 Subject: [PATCH 1/2] rustpkg: Reorganize test files --- .../testsuite/pass/src/deeply/nested/path/foo/{src => }/main.rs | 0 .../testsuite/pass/src/external-crate/{src => }/main.rs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/{src => }/main.rs (100%) rename src/librustpkg/testsuite/pass/src/external-crate/{src => }/main.rs (100%) 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/main.rs similarity index 100% rename from src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/src/main.rs rename to src/librustpkg/testsuite/pass/src/deeply/nested/path/foo/main.rs diff --git a/src/librustpkg/testsuite/pass/src/external-crate/src/main.rs b/src/librustpkg/testsuite/pass/src/external-crate/main.rs similarity index 100% rename from src/librustpkg/testsuite/pass/src/external-crate/src/main.rs rename to src/librustpkg/testsuite/pass/src/external-crate/main.rs From e732912954c480d435d2760c259a44cf8837ac55 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 15 May 2013 16:15:26 -0700 Subject: [PATCH 2/2] rustpkg: ignore tests on i686, since they fail --- src/librustpkg/tests.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs index 487e8d0da36e..8eba3f06de38 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();