1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
--- a/src/test/destructors.rs
+++ b/src/test/destructors.rs
@@ -74,7 +74,7 @@ macro_rules! impl_client_objectdata {
impl_client_objectdata!(client_rs);
impl_client_objectdata!(client_sys);
-expand_test!(destructor_request, {
+/* expand_test!(destructor_request, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
let _client_id = server.handle().insert_client(rx, Arc::new(())).unwrap();
@@ -188,7 +188,7 @@ expand_test!(destructor_cleanup, {
server.flush(None).unwrap();
assert!(server_data.0.load(Ordering::Acquire));
-});
+}); */
struct ServerClientData(AtomicBool);
--- a/src/test/many_args.rs
+++ b/src/test/many_args.rs
@@ -122,7 +122,7 @@ macro_rules! clientdata_impls {
clientdata_impls!(client_rs);
clientdata_impls!(client_sys);
-// create a global and send the many_args method
+/* // create a global and send the many_args method
expand_test!(many_args, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
@@ -196,4 +196,4 @@ expand_test!(many_args, {
server.dispatch_all_clients(&mut ()).unwrap();
assert!(server_data.0.load(Ordering::SeqCst));
-});
+});*/
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -48,12 +48,12 @@ macro_rules! expand_test {
};
}
-mod interfaces {
+/* mod interfaces {
use crate as wayland_backend;
wayland_scanner::generate_interfaces!(
"../wayland-scanner/tests/scanner_assets/test-protocol.xml"
);
-}
+} */
mod destructors;
mod many_args;
--- a/src/test/object_args.rs
+++ b/src/test/object_args.rs
@@ -9,7 +9,7 @@ use super::*;
struct ServerData(AtomicBool);
-macro_rules! impl_server_objectdata {
+/* macro_rules! impl_server_objectdata {
($server_backend:tt) => {
impl $server_backend::ObjectData<()> for ServerData {
fn request(
@@ -94,7 +94,7 @@ macro_rules! impl_server_objectdata {
}
impl_server_objectdata!(server_rs);
-impl_server_objectdata!(server_sys);
+impl_server_objectdata!(server_sys);*/
struct ClientData(AtomicBool);
@@ -126,7 +126,7 @@ impl_client_objectdata!(client_rs);
impl_client_objectdata!(client_sys);
// create a global and create objects
-expand_test!(create_objects, {
+/* expand_test!(create_objects, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
let _client_id = server.handle().insert_client(rx, Arc::new(())).unwrap();
@@ -487,4 +487,4 @@ expand_test!(new_id_null_and_non_null, {
client.prepare_read().unwrap().read().unwrap();
assert!(server_data.0.load(Ordering::SeqCst));
-});
+}); */
--- a/src/test/protocol_error.rs
+++ b/src/test/protocol_error.rs
@@ -37,7 +37,7 @@ impl server_sys::GlobalHandler<()> for ServerData<server_sys::ObjectId> {
}
}
-expand_test!(protocol_error, {
+/* expand_test!(protocol_error, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
let _client_id = server.handle().insert_client(rx, Arc::new(())).unwrap();
@@ -107,7 +107,7 @@ expand_test!(protocol_error, {
}
_ => panic!("Bad ret: {ret:?}"),
}
-});
+}); */
expand_test!(client_wrong_id, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
@@ -255,7 +255,7 @@ impl<D> server_sys::ObjectData<D> for ProtocolErrorServerData {
}
}
-expand_test!(protocol_error_in_request_without_object_init, {
+/* expand_test!(protocol_error_in_request_without_object_init, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
let _client_id = server.handle().insert_client(rx, Arc::new(())).unwrap();
@@ -316,4 +316,4 @@ expand_test!(protocol_error_in_request_without_object_init, {
// the server should not panic, and gracefull accept that the user did not provide any object data for
// the already destroyed object
-});
+}); */
--- a/src/test/server_created_objects.rs
+++ b/src/test/server_created_objects.rs
@@ -9,7 +9,7 @@ use super::*;
struct ServerData;
-macro_rules! impl_globalhandler {
+/* macro_rules! impl_globalhandler {
($server_backend:tt) => {
impl $server_backend::GlobalHandler<()> for ServerData {
fn bind(
@@ -60,7 +60,7 @@ macro_rules! impl_globalhandler {
}
impl_globalhandler!(server_rs);
-impl_globalhandler!(server_sys);
+impl_globalhandler!(server_sys); */
struct ClientData(AtomicU32);
@@ -108,7 +108,7 @@ macro_rules! impl_client_objectdata {
impl_client_objectdata!(client_rs);
impl_client_objectdata!(client_sys);
-expand_test!(server_created_object, {
+/* expand_test!(server_created_object, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
let _client_id = server.handle().insert_client(rx, Arc::new(())).unwrap();
@@ -154,4 +154,4 @@ expand_test!(server_created_object, {
client.prepare_read().unwrap().read().unwrap();
assert_eq!(client_data.0.load(Ordering::SeqCst), 2);
-});
+}); */
--- a/src/test/sync.rs
+++ b/src/test/sync.rs
@@ -33,7 +33,7 @@ impl client_sys::ObjectData for SyncData {
fn destroyed(&self, _: client_sys::ObjectId) {}
}
-// send a wl_display.sync request and receive the response
+/* // send a wl_display.sync request and receive the response
expand_test!(sync, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
let mut server = server_backend::Backend::new().unwrap();
@@ -98,7 +98,7 @@ expand_test!(panic test_bad_placeholder, {
assert!(sync_data.0.load(Ordering::SeqCst));
// and the sync object should be dead
assert!(client.get_data(sync_id).is_err());
-});
+}); */
expand_test!(panic test_bad_signature, {
let (tx, rx) = std::os::unix::net::UnixStream::pair().unwrap();
|
