adjust travis and appveyor tests to be run

hickory-dns · Oct 11, 2017 · cb9152f · cb9152f
1 parent 56874c5
commit cb9152f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,26 +12,27 @@ matrix:
 
     # no features
     - rust: stable
-      env: MODULES="client"
-           CLIENT_OPTIONS="--no-default-features"
+      env: MODULES="client integration-tests openssl proto resolver server"
+           OPTIONS="--no-default-features"
 
     # default features...
     - rust: stable
-      env: MODULES="client"
+      env: MODULES="client integration-tests openssl proto resolver server"
 
     # just openssl
     - rust: stable
-      env: MODULES="client"
-           CLIENT_OPTIONS="--no-default-features --features=dnssec-openssl"  
+      env: MODULES="client integration-tests openssl proto resolver server"
+           OPTIONS="--no-default-features --features=dnssec-openssl"
 
-    # just tls using openssl
+    # just ring
     - rust: stable
-      env: MODULES="openssl"
+      env: MODULES="client integration-tests openssl proto resolver server"
+           OPTIONS="--no-default-features --features=dnssec-ring"
 
-    # just ring
+    # just tls using openssl
     - rust: stable
-      env: MODULES="client"
-           CLIENT_OPTIONS="--no-default-features --features=dnssec-ring" 
+      env: MODULES="integration-tests server"
+           OPTIONS="--no-default-features --features=tls-openssl"
 
     # min rust version
     # - rust: 1.14.0

diff --git a/appveyor.yml b/appveyor.yml
@@ -30,17 +30,37 @@ install:
 build: false
 
 test_script:
+  - cargo test --manifest-path proto/Cargo.toml
+  - cargo test --manifest-path proto/Cargo.toml --all-features
+  - cargo test --manifest-path proto/Cargo.toml --no-default-features
+  - cargo test --manifest-path proto/Cargo.toml --no-default-features --features=dnssec-openssl
+  - cargo test --manifest-path proto/Cargo.toml --no-default-features --features=dnssec-ring
+
+  - cargo test --manifest-path client/Cargo.toml
   - cargo test --manifest-path client/Cargo.toml --all-features
   - cargo test --manifest-path client/Cargo.toml --no-default-features
-  - cargo test --manifest-path client/Cargo.toml
   - cargo test --manifest-path client/Cargo.toml --no-default-features --features=dnssec-openssl
-  - cargo test --manifest-path client/Cargo.toml --no-default-features
   - cargo test --manifest-path client/Cargo.toml --no-default-features --features=dnssec-ring
 
   - cargo test --manifest-path rustls/Cargo.toml
   - cargo test --manifest-path openssl/Cargo.toml
 
   - cargo test --manifest-path resolver/Cargo.toml
+  - cargo test --manifest-path resolver/Cargo.toml --all-features
+  - cargo test --manifest-path resolver/Cargo.toml --no-default-features
+  - cargo test --manifest-path resolver/Cargo.toml --no-default-features --features=dnssec-openssl
+  - cargo test --manifest-path resolver/Cargo.toml --no-default-features --features=dnssec-ring
 
-  - cargo test --manifest-path server/Cargo.toml --all-features
   - cargo test --manifest-path server/Cargo.toml
+  - cargo test --manifest-path server/Cargo.toml --all-features
+  - cargo test --manifest-path server/Cargo.toml --no-default-features
+  - cargo test --manifest-path server/Cargo.toml --no-default-features --features=dnssec-openssl
+  - cargo test --manifest-path server/Cargo.toml --no-default-features --features=dnssec-ring
+  - cargo test --manifest-path server/Cargo.toml --no-default-features --features=tls-openssl
+
+  - cargo test --manifest-path integration-tests/Cargo.toml
+  - cargo test --manifest-path integration-tests/Cargo.toml --all-features
+  - cargo test --manifest-path integration-tests/Cargo.toml --no-default-features
+  - cargo test --manifest-path integration-tests/Cargo.toml --no-default-features --features=dnssec-openssl
+  - cargo test --manifest-path integration-tests/Cargo.toml --no-default-features --features=dnssec-ring
+  - cargo test --manifest-path integration-tests/Cargo.toml --no-default-features --features=tls-openssl
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-MODULES=${MODULES:-"client integration-tests native-tls resolver rustls server"}
+MODULES=${MODULES:-"client integration-tests native-tls openssl proto resolver rustls server"}
 CLIENT_OPTIONS=${CLIENT_OPTIONS} # add in all features
 OPTIONS=${OPTIONS}