From e23a7be3d39cf9d3b0f99626f20ce699b611ff15 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Thu, 5 Sep 2019 14:10:58 +0100 Subject: [PATCH 1/2] Update the sanity limit to 200M per file This is needed because the stdlib .rlib files are now around 100M and some targets exceed the old sanity limit. This will close #1982 Signed-off-by: Daniel Silverstone --- src/dist/component/package.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs index 1663ad1e9f..4b432785ab 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs @@ -277,7 +277,7 @@ fn unpack_without_first_dir<'a, R: Read>( let entries = archive .entries() .chain_err(|| ErrorKind::ExtractingPackage)?; - const MAX_FILE_SIZE: u64 = 100_000_000; + const MAX_FILE_SIZE: u64 = 200_000_000; let mut budget = MemoryBudget::new(MAX_FILE_SIZE as usize); let mut directories: HashMap = HashMap::new(); From 9eb2b440678f85d5f10b847e3ae49a39151a0842 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Thu, 5 Sep 2019 14:57:06 +0100 Subject: [PATCH 2/2] ci/run.bash: Fix sed expression Some of our CI platforms couldn't cope with 'sed -E' Signed-off-by: Daniel Silverstone --- ci/run.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/run.bash b/ci/run.bash index 1496eb75dc..8317890d8d 100644 --- a/ci/run.bash +++ b/ci/run.bash @@ -32,8 +32,8 @@ if [ -z "$SKIP_TESTS" ]; then runtest --test dist -- --test-threads 1 - find ./tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \ - | sed -E 's@\./tests/(.+)\.rs@\1@g' \ + find tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \ + | sed -e 's@^tests/@@;s@\.rs$@@g' \ | while read -r test; do runtest --test "${test}" done