From 0d2fac789050e1dfef78e9552f3b1a37c7c1e7f2 Mon Sep 17 00:00:00 2001
From: Victor Koenders <gpg@trangar.com>
Date: Fri, 1 Apr 2022 13:20:08 +0200
Subject: [PATCH] Fixed a failing test on 32 bit platforms, re-enabled all
 platforms for testing

---
 .github/workflows/cross_platform.yml | 34 ++++++++++++++--------------
 tests/alloc.rs                       |  8 ++++++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cross_platform.yml b/.github/workflows/cross_platform.yml
index daffea48..f29a1e2f 100644
--- a/.github/workflows/cross_platform.yml
+++ b/.github/workflows/cross_platform.yml
@@ -24,24 +24,24 @@
         "matrix": {
           "platform": [
             "aarch64-unknown-linux-gnu",
-            # "arm-unknown-linux-gnueabi",
-            # "arm-unknown-linux-gnueabihf",
-            # "armv5te-unknown-linux-gnueabi",
-            # "armv7-unknown-linux-gnueabihf",
-            # "i586-unknown-linux-gnu",
-            # "i686-pc-windows-gnu",
-            # "i686-unknown-linux-gnu",
-            # "mips-unknown-linux-gnu",
+            "arm-unknown-linux-gnueabi",
+            "arm-unknown-linux-gnueabihf",
+            "armv5te-unknown-linux-gnueabi",
+            "armv7-unknown-linux-gnueabihf",
+            "i586-unknown-linux-gnu",
+            "i686-pc-windows-gnu",
+            "i686-unknown-linux-gnu",
+            "mips-unknown-linux-gnu",
             "mips64-unknown-linux-gnuabi64",
-            "mips64el-unknown-linux-gnuabi64"
-            # "mipsel-unknown-linux-gnu",
-            # "powerpc-unknown-linux-gnu",
-            # "powerpc64-unknown-linux-gnu",
-            # "powerpc64le-unknown-linux-gnu",
-            # "riscv64gc-unknown-linux-gnu",
-            # "sparc64-unknown-linux-gnu",
-            # "x86_64-pc-windows-gnu",
-            # "x86_64-unknown-linux-gnu"
+            "mips64el-unknown-linux-gnuabi64",
+            "mipsel-unknown-linux-gnu",
+            "powerpc-unknown-linux-gnu",
+            "powerpc64-unknown-linux-gnu",
+            "powerpc64le-unknown-linux-gnu",
+            "riscv64gc-unknown-linux-gnu",
+            "sparc64-unknown-linux-gnu",
+            "x86_64-pc-windows-gnu",
+            "x86_64-unknown-linux-gnu"
           ]
         }
       },
diff --git a/tests/alloc.rs b/tests/alloc.rs
index 84bffe09..3173ed74 100644
--- a/tests/alloc.rs
+++ b/tests/alloc.rs
@@ -115,7 +115,13 @@ fn test_container_limits() {
             bincode::config::standard().with_limit::<DECODE_LIMIT>(),
         );
 
-        assert_eq!(result.unwrap_err(), DecodeError::LimitExceeded);
+        let name = core::any::type_name::<T>();
+        match result {
+            Ok(_) => panic!("Decoding {} should fail, it instead succeeded", name),
+            Err(DecodeError::OutsideUsizeRange(_)) if cfg!(target_pointer_width = "32") => {},
+            Err(DecodeError::LimitExceeded) => {},
+            Err(e) => panic!("Expected OutsideUsizeRange (on 32 bit platforms) or LimitExceeded whilst decoding {}, got {:?}", name, e),
+        }
     }
 
     for slice in test_cases {