Skip to content

Commit 06ea623

Browse files
committed
---
yaml --- r: 60798 b: refs/heads/auto c: ba33472 h: refs/heads/master v: v3
1 parent 60e09e1 commit 06ea623

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: ff86830c9c2c0e4e88070206bd73f88ad7141b1e
17+
refs/heads/auto: ba33472f9f74c508b9f028703aa6f226b7dfd7c2
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librusti/rusti.rc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,9 @@ mod tests {
453453
}
454454
}
455455

456-
#[test] #[ignore]
456+
#[test]
457457
fn run_all() {
458+
// FIXME(#6511):
458459
// By default, unit tests are run in parallel. Rusti, on the other hand,
459460
// does not enjoy doing this. I suspect that it is because the LLVM
460461
// bindings are not thread-safe (when running parallel tests, some tests
@@ -467,7 +468,7 @@ mod tests {
467468
run_cmds([""]);
468469

469470
debug!("regression test for #5937");
470-
run_cmds(["use core;", ""]);
471+
run_cmds(["use std;", ""]);
471472

472473
debug!("regression test for #5784");
473474
run_cmds(["let a = 1;"]);

branches/auto/src/librustpkg/tests.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ fn test_sysroot() -> Path {
9393
self_path.pop()
9494
}
9595

96-
// Ignored on i686 -- see #6517
9796
#[test]
98-
#[ignore(cfg(target_arch = "x86"))]
9997
fn test_make_dir_rwx() {
10098
let temp = &os::tmpdir();
10199
let dir = temp.push(~"quux");
@@ -109,7 +107,6 @@ fn test_make_dir_rwx() {
109107
}
110108

111109
#[test]
112-
#[ignore(cfg(target_arch = "x86"))]
113110
fn test_install_valid() {
114111
let sysroot = test_sysroot();
115112
debug!("sysroot = %s", sysroot.to_str());
@@ -135,7 +132,6 @@ fn test_install_valid() {
135132
}
136133

137134
#[test]
138-
#[ignore(cfg(target_arch = "x86"))]
139135
fn test_install_invalid() {
140136
use conditions::nonexistent_package::cond;
141137
use cond1 = conditions::missing_pkg_files::cond;
@@ -158,7 +154,6 @@ fn test_install_invalid() {
158154
}
159155

160156
#[test]
161-
#[ignore(cfg(target_arch = "x86"))]
162157
fn test_install_url() {
163158
let workspace = mkdtemp(&os::tmpdir(), "test").expect("couldn't create temp dir");
164159
let sysroot = test_sysroot();

0 commit comments

Comments
 (0)