diff options
| -rw-r--r-- | test/sys/test_ioctl.rs | 22 | ||||
| -rw-r--r-- | test/test.rs | 1 |
2 files changed, 12 insertions, 11 deletions
diff --git a/test/sys/test_ioctl.rs b/test/sys/test_ioctl.rs index 49f49206..78496fcb 100644 --- a/test/sys/test_ioctl.rs +++ b/test/sys/test_ioctl.rs @@ -5,42 +5,42 @@ use nix::sys::ioctl::*; #[test] fn test_op_none() { - assert_eq!(op_none('q' as u8, 10), 0x0000710A); - assert_eq!(op_none('a' as u8, 255), 0x000061FF); + assert_eq!(io!(b'q', 10), 0x0000710A); + assert_eq!(io!(b'a', 255), 0x000061FF); } #[test] fn test_op_write() { - assert_eq!(op_write('z' as u8, 10, 1), 0x40017A0A); - assert_eq!(op_write('z' as u8, 10, 512), 0x42007A0A); + assert_eq!(iow!(b'z', 10, 1), 0x40017A0A); + assert_eq!(iow!(b'z', 10, 512), 0x42007A0A); } #[cfg(target_pointer_width = "64")] #[test] fn test_op_write_64() { - assert_eq!(op_write('z' as u8, 10, 1 << 32), 0x40007A0A); + assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x40007A0A); } #[test] fn test_op_read() { - assert_eq!(op_read('z' as u8, 10, 1), 0x80017A0A); - assert_eq!(op_read('z' as u8, 10, 512), 0x82007A0A); + assert_eq!(ior!(b'z', 10, 1), 0x80017A0A); + assert_eq!(ior!(b'z', 10, 512), 0x82007A0A); } #[cfg(target_pointer_width = "64")] #[test] fn test_op_read_64() { - assert_eq!(op_read('z' as u8, 10, 1 << 32), 0x80007A0A); + assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x80007A0A); } #[test] fn test_op_read_write() { - assert_eq!(op_read_write('z' as u8, 10, 1), 0xC0017A0A); - assert_eq!(op_read_write('z' as u8, 10, 512), 0xC2007A0A); + assert_eq!(iorw!(b'z', 10, 1), 0xC0017A0A); + assert_eq!(iorw!(b'z', 10, 512), 0xC2007A0A); } #[cfg(target_pointer_width = "64")] #[test] fn test_op_read_write_64() { - assert_eq!(op_read_write('z' as u8, 10, 1 << 32), 0xC0007A0A); + assert_eq!(iorw!(b'z', 10, (1 as u64) << 32), 0xC0007A0A); } diff --git a/test/test.rs b/test/test.rs index 5a1edf55..cf60dfd7 100644 --- a/test/test.rs +++ b/test/test.rs @@ -1,3 +1,4 @@ +#[macro_use] extern crate nix; extern crate libc; extern crate rand; |