Clean up directory structure of crates (#589)

* Move all public crates into crates/

Integration tests into tests/

* move test certs into tests/test-data

* fix benches

* fix compatibility tests

.travis.yml

@@ -140,7 +140,7 @@ matrix:
         - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scripts/install_openssl_deb.sh; fi
         - scripts/install_bind.sh
       script:
-        - cargo test --manifest-path compatibility-tests/Cargo.toml --no-default-features --features=bind
+        - cargo test --manifest-path tests/compatibility-tests/Cargo.toml --no-default-features --features=bind
       after_success:
         - scripts/run_kcov.sh
 

Cargo.toml

@@ -1,12 +1,12 @@
 [workspace]
-members = ["client", 
-           "compatibility-tests",
-           "integration-tests",
-           "native-tls",
-           "openssl",
-           "proto",
-           "resolver",
-           "rustls",
-           "https",
-           "server",
+members = ["crates/client", 
+           "crates/native-tls",
+           "crates/openssl",
+           "crates/proto",
+           "crates/resolver",
+           "crates/rustls",
+           "crates/https",
+           "crates/server",
+           "tests/compatibility-tests",
+           "tests/integration-tests",
            "util"]

crates/native-tls/src/tests.rs

@@ -83,11 +83,11 @@ fn tls_client_stream_test(server_addr: IpAddr, mtls: bool) {
     let server_path = env::var("TDNS_SERVER_SRC_ROOT").unwrap_or("../server".to_owned());
     println!("using server src path: {}", server_path);
 
-    let root_cert_der = read_file(&format!("{}/../tests/ca.der", server_path));
+    let root_cert_der = read_file(&format!("{}/../../tests/test-data/ca.der", server_path));
 
     // Generate X509 certificate
     let dns_name = "ns.example.com";
-    let server_pkcs12_der = read_file(&format!("{}/../tests/cert.p12", server_path));
+    let server_pkcs12_der = read_file(&format!("{}/../../tests/test-data/cert.p12", server_path));
 
     // TODO: need a timeout on listen
     let server = std::net::TcpListener::bind(SocketAddr::new(server_addr, 0)).unwrap();