Skip to content

Commit f711650

Browse files
committed
auto merge of #8999 : anasazi/rust/multi-threaded-io-tests, r=brson
Resolves #8685
2 parents 49eb7bd + 6840076 commit f711650

File tree

6 files changed

+190
-51
lines changed

6 files changed

+190
-51
lines changed

src/libstd/rt/io/file.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl Seek for FileStream {
146146
}
147147

148148
fn file_test_smoke_test_impl() {
149-
do run_in_newsched_task {
149+
do run_in_mt_newsched_task {
150150
let message = "it's alright. have a good time";
151151
let filename = &Path("./tmp/file_rt_io_file_test.txt");
152152
{
@@ -174,7 +174,7 @@ fn file_test_io_smoke_test() {
174174
}
175175

176176
fn file_test_invalid_path_opened_without_create_should_raise_condition_impl() {
177-
do run_in_newsched_task {
177+
do run_in_mt_newsched_task {
178178
let filename = &Path("./tmp/file_that_does_not_exist.txt");
179179
let mut called = false;
180180
do io_error::cond.trap(|_| {
@@ -192,7 +192,7 @@ fn file_test_io_invalid_path_opened_without_create_should_raise_condition() {
192192
}
193193

194194
fn file_test_unlinking_invalid_path_should_raise_condition_impl() {
195-
do run_in_newsched_task {
195+
do run_in_mt_newsched_task {
196196
let filename = &Path("./tmp/file_another_file_that_does_not_exist.txt");
197197
let mut called = false;
198198
do io_error::cond.trap(|_| {
@@ -209,7 +209,7 @@ fn file_test_iounlinking_invalid_path_should_raise_condition() {
209209
}
210210

211211
fn file_test_io_non_positional_read_impl() {
212-
do run_in_newsched_task {
212+
do run_in_mt_newsched_task {
213213
use str;
214214
let message = "ten-four";
215215
let mut read_mem = [0, .. 8];
@@ -242,7 +242,7 @@ fn file_test_io_non_positional_read() {
242242
}
243243

244244
fn file_test_io_seeking_impl() {
245-
do run_in_newsched_task {
245+
do run_in_mt_newsched_task {
246246
use str;
247247
let message = "ten-four";
248248
let mut read_mem = [0, .. 4];
@@ -276,7 +276,7 @@ fn file_test_io_seek_and_tell_smoke_test() {
276276

277277
fn file_test_io_seek_and_write_impl() {
278278
use io;
279-
do run_in_newsched_task {
279+
do run_in_mt_newsched_task {
280280
use str;
281281
let initial_msg = "food-is-yummy";
282282
let overwrite_msg = "-the-bar!!";
@@ -307,7 +307,7 @@ fn file_test_io_seek_and_write() {
307307
}
308308

309309
fn file_test_io_seek_shakedown_impl() {
310-
do run_in_newsched_task {
310+
do run_in_mt_newsched_task {
311311
use str; // 01234567890123
312312
let initial_msg = "qwer-asdf-zxcv";
313313
let chunk_one = "qwer";

0 commit comments

Comments
 (0)