From 0fb5ccb81446b76cb20dd26c0e39e0cbc3965b8d Mon Sep 17 00:00:00 2001
From: Harry Barber <106155934+hlbarber@users.noreply.github.com>
Date: Thu, 28 Jul 2022 21:40:49 +0100
Subject: [PATCH] Remove excess cargo test passes from additional-ci (#1595)

* Use --exclude-all-features in additional-ci

* Remove excess cargo test --all-features

* Improve powerset echo
---
 aws/rust-runtime/aws-config/additional-ci         | 8 ++++----
 rust-runtime/aws-smithy-async/additional-ci       | 4 ++--
 rust-runtime/aws-smithy-eventstream/additional-ci | 4 ++--
 rust-runtime/aws-smithy-http/additional-ci        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aws/rust-runtime/aws-config/additional-ci b/aws/rust-runtime/aws-config/additional-ci
index 345dbc2d25..04c06b4f15 100755
--- a/aws/rust-runtime/aws-config/additional-ci
+++ b/aws/rust-runtime/aws-config/additional-ci
@@ -14,10 +14,10 @@ cargo "+${RUST_NIGHTLY_VERSION:-nightly}" api-linter --all-features --config api
 echo "### Checking for duplicate dependency versions in the normal dependency graph with all features enabled"
 cargo tree -d --edges normal --all-features
 
-echo "### Testing with all features enabled"
-cargo test --all-features
-
-echo "### Testing each feature in isolation"
+# `aws-config` is not part of the `rust-runtime` workspace. As a result it is not run through
+# `check-rust-runtimes-and-tools` and does not get `cargo test --all-features` prior to this point. As a result we do
+# not apply `--exclude-all-features` here.
+echo "### Testing every combination of features"
 cargo hack test --feature-powerset
 
 echo "### Checking that compiling with the minimal versions succeeds"
diff --git a/rust-runtime/aws-smithy-async/additional-ci b/rust-runtime/aws-smithy-async/additional-ci
index 73ca91bd05..fde542e9fc 100755
--- a/rust-runtime/aws-smithy-async/additional-ci
+++ b/rust-runtime/aws-smithy-async/additional-ci
@@ -11,5 +11,5 @@ set -e
 echo "### Checking for duplicate dependency versions in the normal dependency graph with all features enabled"
 cargo tree -d --edges normal --all-features
 
-echo "### Checking each feature"
-cargo hack test --feature-powerset
+echo "### Testing every combination of features (excluding --all-features)"
+cargo hack test --feature-powerset --exclude-all-features
diff --git a/rust-runtime/aws-smithy-eventstream/additional-ci b/rust-runtime/aws-smithy-eventstream/additional-ci
index 73ca91bd05..fde542e9fc 100755
--- a/rust-runtime/aws-smithy-eventstream/additional-ci
+++ b/rust-runtime/aws-smithy-eventstream/additional-ci
@@ -11,5 +11,5 @@ set -e
 echo "### Checking for duplicate dependency versions in the normal dependency graph with all features enabled"
 cargo tree -d --edges normal --all-features
 
-echo "### Checking each feature"
-cargo hack test --feature-powerset
+echo "### Testing every combination of features (excluding --all-features)"
+cargo hack test --feature-powerset --exclude-all-features
diff --git a/rust-runtime/aws-smithy-http/additional-ci b/rust-runtime/aws-smithy-http/additional-ci
index 224d451ba1..b44c6c05be 100755
--- a/rust-runtime/aws-smithy-http/additional-ci
+++ b/rust-runtime/aws-smithy-http/additional-ci
@@ -8,5 +8,5 @@
 
 set -e
 
-echo "### Testing feature powerset"
-cargo hack test --feature-powerset
+echo "### Testing every combination of features (excluding --all-features)"
+cargo hack test --feature-powerset --exclude-all-features