diff options
| author | Trevor Gross <t.gross35@gmail.com> | 2024-08-27 01:46:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 01:46:50 -0500 |
| commit | e209b05037e418c8984993bf499d310655cced13 (patch) | |
| tree | dc93079455c14698e4a89c6151395c0c579c14af /src/ci/docker/scripts | |
| parent | d2ff033302fd6ff42b5d4a6f481e3fc5466c6a58 (diff) | |
| parent | 5d83cb27c886137887c087fbce77032069f5ec8f (diff) | |
| download | rust-e209b05037e418c8984993bf499d310655cced13.tar.gz rust-e209b05037e418c8984993bf499d310655cced13.zip | |
Rollup merge of #128935 - lqd:needs-zstd, r=Kobzol
More work on `zstd` compression r? ``@Kobzol`` as we've discussed this. This is a draft to show the current approach of supporting zstd in compiletest, and making the tests using it unconditional. Knowing whether llvm/lld was built with `LLVM_ENABLE_ZSTD` is quite hard, so there are two strategies. There are details in the code, and we can discuss this approach. Until we know the config used to build CI artifacts, it seems our options are somewhat limited in any case. zlib compression seems always enabled, so we only check this in its dedicated test, allowing the test to ignore errors due to zstd not being supported. The zstd test is made unconditional in what it tests, by relying on `needs-llvm-zstd` to be ignored when `llvm.libzstd` isn't enabled in `config.toml`. try-job: x86_64-gnu try-job: x86_64-msvc try-job: x86_64-gnu-distcheck
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/zstd.sh | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/ci/docker/scripts/zstd.sh b/src/ci/docker/scripts/zstd.sh deleted file mode 100755 index a3d37ccc311..00000000000 --- a/src/ci/docker/scripts/zstd.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -ex - -hide_output() { - set +x - on_err=" -echo ERROR: An error was encountered with the build. -cat /tmp/zstd_build.log -exit 1 -" - trap "$on_err" ERR - bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & - PING_LOOP_PID=$! - "$@" &> /tmp/zstd_build.log - trap - ERR - kill $PING_LOOP_PID - rm /tmp/zstd_build.log - set -x -} - -ZSTD=1.5.6 -curl -L https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz | tar xzf - - -cd zstd-$ZSTD -CFLAGS=-fPIC hide_output make -j$(nproc) VERBOSE=1 -hide_output make install - -cd .. -rm -rf zstd-$ZSTD |