diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-25 19:19:59 +0200 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-25 19:39:50 +0200 |
| commit | 12b63f5c35532ea265d7ac9198c9668f5e640668 (patch) | |
| tree | ef6f6344757129b0a7bb2c15dad7fbff25f0f9ca | |
| parent | c3079a98560efd4bd3995aab898e404e14855ce8 (diff) | |
| download | rust-12b63f5c35532ea265d7ac9198c9668f5e640668.tar.gz rust-12b63f5c35532ea265d7ac9198c9668f5e640668.zip | |
ci: integration tests: print clippy run output and set LD_LIBRARY_PATH to rustc sysroot
| -rw-r--r-- | .github/workflows/clippy_bors.yml | 7 | ||||
| -rw-r--r-- | tests/integration.rs | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 5869cd0b1a4..a686198f781 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -232,6 +232,11 @@ jobs: - name: Install toolchain run: rustup show active-toolchain + - name: Set LD_LIBRARY_PATH + run: | + SYSROOT=$(rustc --print sysroot) + echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV + # Download - name: Download target dir uses: actions/download-artifact@v3 @@ -246,7 +251,7 @@ jobs: - name: Test ${{ matrix.integration }} run: | RUSTUP_TOOLCHAIN="$(rustup show active-toolchain | grep -o -E "nightly-[0-9]{4}-[0-9]{2}-[0-9]{2}")" \ - $CARGO_TARGET_DIR/debug/integration + $CARGO_TARGET_DIR/debug/integration --show-output env: INTEGRATION: ${{ matrix.integration }} diff --git a/tests/integration.rs b/tests/integration.rs index a771d8b87c8..e72891c44c2 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -65,6 +65,10 @@ fn integration_test() { .expect("unable to run clippy"); let stderr = String::from_utf8_lossy(&output.stderr); + + // debug: + eprintln!("{stderr}"); + if let Some(backtrace_start) = stderr.find("error: internal compiler error") { static BACKTRACE_END_MSG: &str = "end of query stack"; let backtrace_end = stderr[backtrace_start..] |