Skip to content

Commit 429b5f8

Browse files
committed
std: rename tmp file paths to go into ./tmp folder in builddir
1 parent 13eb259 commit 429b5f8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/libstd/rt/io/file.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl Seek for FileStream {
192192
fn file_test_smoke_test_impl() {
193193
do run_in_newsched_task {
194194
let message = "it's alright. have a good time";
195-
let filename = &Path("./rt_io_file_test.txt");
195+
let filename = &Path("./tmp/file_rt_io_file_test.txt");
196196
{
197197
let mut write_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
198198
write_stream.write(message.as_bytes());
@@ -218,7 +218,7 @@ fn file_test_io_smoke_test() {
218218

219219
fn file_test_invalid_path_opened_without_create_should_raise_condition_impl() {
220220
do run_in_newsched_task {
221-
let filename = &Path("./file_that_does_not_exist.txt");
221+
let filename = &Path("./tmp/file_that_does_not_exist.txt");
222222
let mut called = false;
223223
do io_error::cond.trap(|_| {
224224
called = true;
@@ -236,7 +236,7 @@ fn file_test_io_invalid_path_opened_without_create_should_raise_condition() {
236236

237237
fn file_test_unlinking_invalid_path_should_raise_condition_impl() {
238238
do run_in_newsched_task {
239-
let filename = &Path("./another_file_that_does_not_exist.txt");
239+
let filename = &Path("./tmp/file_another_file_that_does_not_exist.txt");
240240
let mut called = false;
241241
do io_error::cond.trap(|_| {
242242
called = true;
@@ -256,7 +256,7 @@ fn file_test_io_non_positional_read_impl() {
256256
use str;
257257
let message = "ten-four";
258258
let mut read_mem = [0, .. 8];
259-
let filename = &Path("./rt_io_file_test_positional.txt");
259+
let filename = &Path("./tmp/file_rt_io_file_test_positional.txt");
260260
{
261261
let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
262262
rw_stream.write(message.as_bytes());
@@ -291,7 +291,7 @@ fn file_test_io_seeking_impl() {
291291
let set_cursor = 4 as u64;
292292
let mut tell_pos_pre_read;
293293
let mut tell_pos_post_read;
294-
let filename = &Path("./rt_io_file_test_seeking.txt");
294+
let filename = &Path("./tmp/file_rt_io_file_test_seeking.txt");
295295
{
296296
let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
297297
rw_stream.write(message.as_bytes());
@@ -324,7 +324,7 @@ fn file_test_io_seek_and_write_impl() {
324324
let final_msg = "foo-the-bar!!";
325325
let seek_idx = 3;
326326
let mut read_mem = [0, .. 13];
327-
let filename = &Path("./rt_io_file_test_seek_and_write.txt");
327+
let filename = &Path("./tmp/file_rt_io_file_test_seek_and_write.txt");
328328
{
329329
let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
330330
rw_stream.write(initial_msg.as_bytes());
@@ -354,7 +354,7 @@ fn file_test_io_seek_shakedown_impl() {
354354
let chunk_two = "asdf";
355355
let chunk_three = "zxcv";
356356
let mut read_mem = [0, .. 4];
357-
let filename = &Path("./rt_io_file_test_seek_shakedown.txt");
357+
let filename = &Path("./tmp/file_rt_io_file_test_seek_shakedown.txt");
358358
{
359359
let mut rw_stream = FileStream::open(filename, Create, ReadWrite).unwrap();
360360
rw_stream.write(initial_msg.as_bytes());

src/libstd/rt/uv/file.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ mod test {
281281
// these aren't defined in std::libc :(
282282
//map_mode(S_IRGRP) |
283283
//map_mode(S_IROTH);
284-
let path_str = "./file_full_simple.txt";
284+
let path_str = "./tmp/file_full_simple.txt";
285285
let write_val = "hello".as_bytes().to_owned();
286286
let write_buf = slice_to_uv_buf(write_val);
287287
let write_buf_ptr: *Buf = &write_buf;
@@ -352,7 +352,7 @@ mod test {
352352
S_IRUSR;
353353
//S_IRGRP |
354354
//S_IROTH;
355-
let path_str = "./file_full_simple_sync.txt";
355+
let path_str = "./tmp/file_full_simple_sync.txt";
356356
let write_val = "hello".as_bytes().to_owned();
357357
let write_buf = slice_to_uv_buf(write_val);
358358
// open/create

src/libstd/rt/uv/uvio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ fn file_test_uvio_full_simple_impl() {
17111711
let ro_flags = O_RDONLY;
17121712
let write_val = "hello uvio!";
17131713
let mode = S_IWUSR | S_IRUSR;
1714-
let path = "./file_test_uvio_full.txt";
1714+
let path = "./tmp/file_test_uvio_full.txt";
17151715
{
17161716
let mut fd = (*io).fs_open(&Path(path), create_flags as int, mode as int).unwrap();
17171717
let write_buf = write_val.as_bytes();

0 commit comments

Comments
 (0)