kernel: test: ensure environment variables are cleared

These interfere with the test.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-07-23 17:55:05 +08:00
parent 8242f1b53f
commit ca73e8a8dd

View file

@ -16,6 +16,15 @@ static GLOBAL: &StatsAlloc<std::alloc::System> = &INSTRUMENTED_SYSTEM;
const SERVER_SPEC: &str = "127.0.0.1:0"; const SERVER_SPEC: &str = "127.0.0.1:0";
fn start_kernel(server_spec: &str) -> JoinHandle<()> { fn start_kernel(server_spec: &str) -> JoinHandle<()> {
assert!(
std::env::var("XOUS_LISTEN_ADDR").is_err(),
"XOUS_LISTEN_ADDR environment variable must be unset to run tests"
);
assert!(
std::env::var("XOUS_SERVER").is_err(),
"XOUS_SERVER environment variable must be unset to run tests"
);
let server_addr = server_spec let server_addr = server_spec
.to_socket_addrs() .to_socket_addrs()
.expect("invalid server address") .expect("invalid server address")
@ -26,7 +35,6 @@ fn start_kernel(server_spec: &str) -> JoinHandle<()> {
// let server_addr = temp_server.local_addr().unwrap(); // let server_addr = temp_server.local_addr().unwrap();
// drop(temp_server); // drop(temp_server);
let (send_addr, recv_addr) = channel(); let (send_addr, recv_addr) = channel();
// Launch the main thread // Launch the main thread
@ -445,7 +453,6 @@ fn multiple_contexts() {
// Start the kernel in its own thread // Start the kernel in its own thread
let main_thread = start_kernel(SERVER_SPEC); let main_thread = start_kernel(SERVER_SPEC);
let internal_server = as_process(|| { let internal_server = as_process(|| {
let server = xous::create_server(b"multiple_context").expect("couldn't create server"); let server = xous::create_server(b"multiple_context").expect("couldn't create server");
let connection = xous::connect(server).expect("couldn't connect to our own server"); let connection = xous::connect(server).expect("couldn't connect to our own server");
@ -459,18 +466,18 @@ fn multiple_contexts() {
let mut server_threads = vec![]; let mut server_threads = vec![];
for _ in 0..30 { for _ in 0..30 {
server_threads.push(xous::create_thread(move || { server_threads.push(
let msg = xous::receive_message(server).expect("couldn't receive message"); xous::create_thread(move || {
assert_eq!(msg.message, xous::Message::Scalar(msg_contents)); let msg = xous::receive_message(server).expect("couldn't receive message");
}).expect("couldn't spawn client thread")); assert_eq!(msg.message, xous::Message::Scalar(msg_contents));
} })
.expect("couldn't spawn client thread"),
);
}
for _ in &server_threads { for _ in &server_threads {
xous::send_message( xous::send_message(connection, xous::Message::Scalar(msg_contents))
connection, .expect("couldn't send message");
xous::Message::Scalar(msg_contents),
)
.expect("couldn't send message");
} }
for server_thread in server_threads.into_iter() { for server_thread in server_threads.into_iter() {
xous::wait_thread(server_thread).expect("couldn't wait for thread"); xous::wait_thread(server_thread).expect("couldn't wait for thread");