Skip to content

Commit 51f04aa

Browse files
committed
---
yaml --- r: 6292 b: refs/heads/master c: f157d0b h: refs/heads/master v: v3
1 parent f55ad72 commit 51f04aa

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 9b89b0cffddced063bfb46671b69aba81956e553
2+
refs/heads/master: f157d0b32c853250a902549b11dbd481465b8f45

trunk/src/compiletest/runtest.rs

-7
Original file line numberDiff line numberDiff line change
@@ -335,20 +335,13 @@ fn dump_output(config: config, testfile: str, out: str, err: str) {
335335
maybe_dump_to_stdout(config, out, err);
336336
}
337337

338-
#[cfg(target_os = "win32")]
339-
#[cfg(target_os = "linux")]
340338
fn dump_output_file(config: config, testfile: str, out: str, extension: str) {
341339
let outfile = make_out_name(config, testfile, extension);
342340
let writer = result::get(
343341
io::file_writer(outfile, [io::create, io::truncate]));
344342
writer.write_str(out);
345343
}
346344

347-
// FIXME (726): Can't use file_writer on mac
348-
#[cfg(target_os = "macos")]
349-
fn dump_output_file(config: config, testfile: str, out: str, extension: str) {
350-
}
351-
352345
fn make_out_name(config: config, testfile: str, extension: str) -> str {
353346
output_base_name(config, testfile) + "." + extension
354347
}

trunk/src/lib/macos_os.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ mod libc_constants {
4242
const O_TEXT: int = 0; // nonexistent in darwin libc
4343
const O_BINARY: int = 0; // nonexistent in darwin libc
4444

45-
const S_IRUSR: uint = 1024u;
46-
const S_IWUSR: uint = 512u;
45+
const S_IRUSR: uint = 256u;
46+
const S_IWUSR: uint = 128u;
4747
}
4848

4949
// FIXME turn into constants

trunk/src/test/stdtest/io.rs

-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import std::io;
44
import std::str;
55
import std::result;
66

7-
// FIXME (726)
87
#[test]
9-
#[ignore(cfg(target_os = "macos"))]
108
fn test_simple() {
119
let tmpfile: str = "test/run-pass/lib-io-test-simple.tmp";
1210
log tmpfile;
@@ -34,8 +32,6 @@ fn file_reader_not_exist() {
3432
}
3533

3634
#[test]
37-
// FIXME (726)
38-
#[ignore(cfg(target_os = "macos"))]
3935
fn file_buf_writer_bad_name() {
4036
alt io::file_buf_writer("?/?", []) {
4137
result::err(e) {
@@ -46,8 +42,6 @@ fn file_buf_writer_bad_name() {
4642
}
4743

4844
#[test]
49-
// FIXME (726)
50-
#[ignore(cfg(target_os = "macos"))]
5145
fn buffered_file_buf_writer_bad_name() {
5246
alt io::buffered_file_buf_writer("?/?") {
5347
result::err(e) {

0 commit comments

Comments
 (0)