From 06aa919d590816e3b13c88ec5011239b690ad2a4 Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Thu, 10 Feb 2022 18:29:53 -0800
Subject: [PATCH] test_infra: Enable cross-build for "musl" and "aarch64"
 targets

With enabling the `vendered-openssl` feature, we can now cross-build the
`test_infra` crate for  "musl" and "aarch64" targets. In this way, we
can remove the `test_infra` crate from the "exclude" list, so that this
crate can be checked and processed by "cargo clippy" and "cargo fmt".

More details can be found: https://docs.rs/openssl/latest/openssl/#vendored

As 'musl-gcc' is required, this commit also installs the `musl-tools`
package for our "build" github action on the musl target [1].

[1] https://github.com/actions-rs/toolchain/issues/102

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 .github/workflows/build.yaml |  3 +++
 Cargo.lock                   | 10 ++++++++++
 Cargo.toml                   |  1 -
 test_infra/Cargo.toml        |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 627a3740f0..db991eba33 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,6 +22,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install musl-gcc
+        run: sudo apt install -y musl-tools
+
       - name: Install Rust toolchain (${{ matrix.rust }})
         uses: actions-rs/toolchain@v1
         with:
diff --git a/Cargo.lock b/Cargo.lock
index 83a5c82919..254ccb8e88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -542,6 +542,15 @@ dependencies = [
  "vmm-sys-util",
 ]
 
+[[package]]
+name = "openssl-src"
+version = "111.17.0+1.1.1m"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.72"
@@ -551,6 +560,7 @@ dependencies = [
  "autocfg",
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 52e49a620b..c6d7a15636 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,4 +85,3 @@ members = [
     "vm-migration",
     "vm-virtio"
 ]
-exclude = ["test_infra"]
diff --git a/test_infra/Cargo.toml b/test_infra/Cargo.toml
index c0358f48ee..118eb95dbb 100644
--- a/test_infra/Cargo.toml
+++ b/test_infra/Cargo.toml
@@ -9,6 +9,6 @@ dirs = "3.0.1"
 epoll = "4.3.1"
 lazy_static= "1.4.0"
 libc = "0.2.91"
-ssh2 = "0.9.1"
+ssh2 = { version = "0.9.1", features = ["vendored-openssl"]}
 vmm-sys-util = "0.9.0"
 wait-timeout = "0.2.0"