From 6abf126c2a7a451cded8c6b5e6ddf1b69c84055d Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Tue, 2 Feb 2021 19:05:46 +0800 Subject: chore: remove std directory (#9361) This removes the std folder from the tree. Various parts of the tests are pretty tightly dependent on std (47 direct imports and 75 indirect imports, not counting the cli tests that use them as fixtures) so I've added std as a submodule for now. --- test_util/src/lib.rs | 8 ++++---- test_util/std | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 160000 test_util/std (limited to 'test_util') diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index da7c8703e..37b1819d8 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -272,8 +272,8 @@ async fn get_tls_config( } async fn run_wss_server(addr: &SocketAddr) { - let cert_file = "std/http/testdata/tls/localhost.crt"; - let key_file = "std/http/testdata/tls/localhost.key"; + let cert_file = "cli/tests/tls/localhost.crt"; + let key_file = "cli/tests/tls/localhost.key"; let tls_config = get_tls_config(cert_file, key_file).await.unwrap(); let tls_acceptor = TlsAcceptor::from(tls_config); @@ -691,8 +691,8 @@ async fn wrap_main_server() { async fn wrap_main_https_server() { let main_server_https_addr = SocketAddr::from(([127, 0, 0, 1], HTTPS_PORT)); - let cert_file = "std/http/testdata/tls/localhost.crt"; - let key_file = "std/http/testdata/tls/localhost.key"; + let cert_file = "cli/tests/tls/localhost.crt"; + let key_file = "cli/tests/tls/localhost.key"; let tls_config = get_tls_config(cert_file, key_file) .await .expect("Cannot get TLS config"); diff --git a/test_util/std b/test_util/std new file mode 160000 index 000000000..5ae977b81 --- /dev/null +++ b/test_util/std @@ -0,0 +1 @@ +Subproject commit 5ae977b81ff1522f73301bc87f929dbdc0d69540 -- cgit v1.2.3