Skip to content

Commit 3e171b4

Browse files
committed
---
yaml --- r: 101871 b: refs/heads/master c: 75d92db h: refs/heads/master i: 101869: 570bcd1 101867: c4e6faa 101863: e900571 101855: 4eff26b v: v3
1 parent 001b7d5 commit 3e171b4

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 76a59fd6e2d5c8c42193c047fd5eaba982d499f7
2+
refs/heads/master: 75d92dbabe5bab3a1ca85c305a3773bca2e38145
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
55
refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/libstd/unstable/mutex.rs

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,15 +459,15 @@ mod test {
459459
use rt::thread::Thread;
460460

461461
#[test]
462-
fn somke_lock() {
462+
fn smoke_lock() {
463463
static mut lock: Mutex = MUTEX_INIT;
464464
unsafe {
465465
let _guard = lock.lock();
466466
}
467467
}
468468

469469
#[test]
470-
fn somke_cond() {
470+
fn smoke_cond() {
471471
static mut lock: Mutex = MUTEX_INIT;
472472
unsafe {
473473
let mut guard = lock.lock();
@@ -482,6 +482,32 @@ mod test {
482482
}
483483
}
484484

485+
#[test]
486+
fn smoke_lock_noguard() {
487+
static mut lock: Mutex = MUTEX_INIT;
488+
unsafe {
489+
lock.lock_noguard();
490+
lock.unlock_noguard();
491+
}
492+
}
493+
494+
#[test]
495+
fn smoke_cond_noguard() {
496+
static mut lock: Mutex = MUTEX_INIT;
497+
unsafe {
498+
lock.lock_noguard();
499+
let t = Thread::start(proc() {
500+
lock.lock_noguard();
501+
lock.signal_noguard();
502+
lock.unlock_noguard();
503+
});
504+
lock.wait_noguard();
505+
lock.unlock_noguard();
506+
507+
t.join();
508+
}
509+
}
510+
485511
#[test]
486512
fn destroy_immediately() {
487513
unsafe {

0 commit comments

Comments
 (0)