try fix

fortanix · Sep 8, 2023 · 5c0bd38 · 5c0bd38
1 parent 1fb9044
commit 5c0bd38
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,27 +24,27 @@ jobs:
     strategy:
       matrix:
         include:
-          - rust: stable
-            target: x86_64-unknown-linux-gnu
-            os: ubuntu-20.04
-          - rust: stable
-            target: aarch64-unknown-linux-musl
-            os: ubuntu-20.04
-          - rust: stable
-            target: x86_64-fortanix-unknown-sgx
-            os: ubuntu-20.04
-          - rust: beta
-            target: x86_64-unknown-linux-gnu
-            os: ubuntu-20.04
-          - rust: nightly
-            target: x86_64-unknown-linux-gnu
-            os: ubuntu-20.04
+          # - rust: stable
+          #   target: x86_64-unknown-linux-gnu
+          #   os: ubuntu-20.04
+          # - rust: stable
+          #   target: aarch64-unknown-linux-musl
+          #   os: ubuntu-20.04
+          # - rust: stable
+          #   target: x86_64-fortanix-unknown-sgx
+          #   os: ubuntu-20.04
+          # - rust: beta
+          #   target: x86_64-unknown-linux-gnu
+          #   os: ubuntu-20.04
+          # - rust: nightly
+          #   target: x86_64-unknown-linux-gnu
+          #   os: ubuntu-20.04
           - rust: stable
             target: x86_64-apple-darwin
             os: macos-latest
-          - rust: stable
-            target: x86_64-pc-windows-msvc
-            os: windows-latest
+          # - rust: stable
+          #   target: x86_64-pc-windows-msvc
+          #   os: windows-latest
 
     runs-on: ${{ matrix.os }}
 

diff --git a/ct.sh b/ct.sh
@@ -94,6 +94,10 @@ export CC_aarch64_unknown_linux_musl=/tmp/aarch64-linux-musl-cross/bin/aarch64-l
 export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
 export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER=qemu-aarch64
 
+compiler_stack_size=16
+ulimit -s "$(expr "$compiler_stack_size" \* 1024)"
+export RUST_MIN_STACK="$(expr "$compiler_stack_size" \* 1024 \* 1024)"
+
 cd "./mbedtls"
 case "$TRAVIS_RUST_VERSION" in
     stable|beta|nightly)
@@ -104,6 +108,11 @@ case "$TRAVIS_RUST_VERSION" in
 
         # The SGX target cannot be run under test like a ELF binary
         if [ "$TARGET" != "x86_64-fortanix-unknown-sgx" ]; then
+            # no_std tests only are able to run on x86 platform
+            if [ "$TARGET" == "x86_64-unknown-linux-gnu" ] || [ "$TARGET" == "x86_64-apple-darwin" ] || [[ "$TARGET" =~ ^x86_64-pc-windows- ]]; then
+                cargo nextest run --no-default-features --features no_std_deps,rdrand,time --target $TARGET
+                cargo nextest run --no-default-features --features no_std_deps --target $TARGET
+            fi
             # make sure that explicitly providing the default target works
             cargo nextest run --target $TARGET --release
             cargo nextest run --features dsa --target $TARGET
@@ -113,11 +122,6 @@ case "$TRAVIS_RUST_VERSION" in
             if [ -n "$AES_NI_SUPPORT" ]; then
                 cargo nextest run --features force_aesni_support,tls13 --target $TARGET
             fi
-            # no_std tests only are able to run on x86 platform
-            if [ "$TARGET" == "x86_64-unknown-linux-gnu" ] || [ "$TARGET" == "x86_64-apple-darwin" ] || [[ "$TARGET" =~ ^x86_64-pc-windows- ]]; then
-                cargo nextest run --no-default-features --features no_std_deps,rdrand,time --target $TARGET
-                cargo nextest run --no-default-features --features no_std_deps --target $TARGET
-            fi
 
         else
             cargo +$TRAVIS_RUST_VERSION test --no-run --target=$TARGET