---

yaml
---
r: 144285
b: refs/heads/try2
c: 429b5f8
h: refs/heads/master
i:
  144283: 668b46b
v: v3

Author: olsonjeffery

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 13eb259a091c373393d996596178f145579c9d7e
+refs/heads/try2: 429b5f88f91e5f23f1ad04f6f9938fd1fa6c39a1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/io/file.rs

@@ -192,7 +192,7 @@ impl Seek for FileStream {
 fn file_test_smoke_test_impl() {
     do run_in_newsched_task {
         let message = "it's alright. have a good time";
-        let filename = &Path("./rt_io_file_test.txt");
+        let filename = &Path("./tmp/file_rt_io_file_test.txt");
         {
             let mut write_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
             write_stream.write(message.as_bytes());
@@ -218,7 +218,7 @@ fn file_test_io_smoke_test() {
 
 fn file_test_invalid_path_opened_without_create_should_raise_condition_impl() {
     do run_in_newsched_task {
-        let filename = &Path("./file_that_does_not_exist.txt");
+        let filename = &Path("./tmp/file_that_does_not_exist.txt");
         let mut called = false;
         do io_error::cond.trap(|_| {
             called = true;
@@ -236,7 +236,7 @@ fn file_test_io_invalid_path_opened_without_create_should_raise_condition() {
 
 fn file_test_unlinking_invalid_path_should_raise_condition_impl() {
     do run_in_newsched_task {
-        let filename = &Path("./another_file_that_does_not_exist.txt");
+        let filename = &Path("./tmp/file_another_file_that_does_not_exist.txt");
         let mut called = false;
         do io_error::cond.trap(|_| {
             called = true;
@@ -256,7 +256,7 @@ fn file_test_io_non_positional_read_impl() {
         use str;
         let message = "ten-four";
         let mut read_mem = [0, .. 8];
-        let filename = &Path("./rt_io_file_test_positional.txt");
+        let filename = &Path("./tmp/file_rt_io_file_test_positional.txt");
         {
             let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
             rw_stream.write(message.as_bytes());
@@ -291,7 +291,7 @@ fn file_test_io_seeking_impl() {
         let set_cursor = 4 as u64;
         let mut tell_pos_pre_read;
         let mut tell_pos_post_read;
-        let filename = &Path("./rt_io_file_test_seeking.txt");
+        let filename = &Path("./tmp/file_rt_io_file_test_seeking.txt");
         {
             let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
             rw_stream.write(message.as_bytes());
@@ -324,7 +324,7 @@ fn file_test_io_seek_and_write_impl() {
         let final_msg =     "foo-the-bar!!";
         let seek_idx = 3;
         let mut read_mem = [0, .. 13];
-        let filename = &Path("./rt_io_file_test_seek_and_write.txt");
+        let filename = &Path("./tmp/file_rt_io_file_test_seek_and_write.txt");
         {
             let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
             rw_stream.write(initial_msg.as_bytes());
@@ -354,7 +354,7 @@ fn file_test_io_seek_shakedown_impl() {
         let chunk_two = "asdf";
         let chunk_three = "zxcv";
         let mut read_mem = [0, .. 4];
-        let filename = &Path("./rt_io_file_test_seek_shakedown.txt");
+        let filename = &Path("./tmp/file_rt_io_file_test_seek_shakedown.txt");
         {
             let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
             rw_stream.write(initial_msg.as_bytes());

branches/try2/src/libstd/rt/uv/file.rs

@@ -281,7 +281,7 @@ mod test {
                 // these aren't defined in std::libc :(
                 //map_mode(S_IRGRP) |
                 //map_mode(S_IROTH);
-            let path_str = "./file_full_simple.txt";
+            let path_str = "./tmp/file_full_simple.txt";
             let write_val = "hello".as_bytes().to_owned();
             let write_buf  = slice_to_uv_buf(write_val);
             let write_buf_ptr: *Buf = &write_buf;
@@ -352,7 +352,7 @@ mod test {
                 S_IRUSR;
                 //S_IRGRP |
                 //S_IROTH;
-            let path_str = "./file_full_simple_sync.txt";
+            let path_str = "./tmp/file_full_simple_sync.txt";
             let write_val = "hello".as_bytes().to_owned();
             let write_buf = slice_to_uv_buf(write_val);
             // open/create

branches/try2/src/libstd/rt/uv/uvio.rs

@@ -1711,7 +1711,7 @@ fn file_test_uvio_full_simple_impl() {
         let ro_flags = O_RDONLY;
         let write_val = "hello uvio!";
         let mode = S_IWUSR | S_IRUSR;
-        let path = "./file_test_uvio_full.txt";
+        let path = "./tmp/file_test_uvio_full.txt";
         {
             let mut fd = (*io).fs_open(&Path(path), create_flags as int, mode as int).unwrap();
             let write_buf = write_val.as_bytes();