Skip to content

Commit 40ec227

Browse files
committed
Auto merge of #11225 - matthiaskrgr:fix_integration_tests2, r=<try>
[wip] Fix integration tests2 wip wap wup changelog: lolno
2 parents d09c8a9 + ea5bb6d commit 40ec227

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/clippy_bors.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,22 +181,20 @@ jobs:
181181
- name: Build Integration Test
182182
env:
183183
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: off
184-
run: cargo test --test integration --features integration --no-run
184+
run: cargo test --test integration --features integration --no-run --show-output
185185

186186
# Upload
187187
- name: Extract Binaries
188188
run: |
189189
DIR=$CARGO_TARGET_DIR/debug
190-
rm $DIR/deps/integration-*.d
191-
mv $DIR/deps/integration-* $DIR/integration
190+
find $DIR/deps/integration-* -executable ! -type d | xargs -I {} mv {} $DIR/integration
192191
find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
193-
rm -rf $CARGO_TARGET_DIR/release
194192
195193
- name: Upload Binaries
196-
uses: actions/upload-artifact@v1
194+
uses: actions/upload-artifact@v3
197195
with:
198-
name: target
199-
path: target
196+
name: binaries
197+
path: target/debug
200198

201199
integration:
202200
needs: integration_build
@@ -206,16 +204,13 @@ jobs:
206204
matrix:
207205
integration:
208206
- 'rust-lang/cargo'
209-
# FIXME: re-enable once fmt_macros is renamed in RLS
210-
# - 'rust-lang/rls'
211207
- 'rust-lang/chalk'
212208
- 'rust-lang/rustfmt'
213209
- 'Marwes/combine'
214210
- 'Geal/nom'
215211
- 'rust-lang/stdarch'
216212
- 'serde-rs/serde'
217-
# FIXME: chrono currently cannot be compiled with `--all-targets`
218-
# - 'chronotope/chrono'
213+
- 'chronotope/chrono'
219214
- 'hyperium/hyper'
220215
- 'rust-random/rand'
221216
- 'rust-lang/futures-rs'
@@ -237,12 +232,17 @@ jobs:
237232
- name: Install toolchain
238233
run: rustup show active-toolchain
239234

235+
- name: Set LD_LIBRARY_PATH
236+
run: |
237+
SYSROOT=$(rustc --print sysroot)
238+
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
239+
240240
# Download
241241
- name: Download target dir
242-
uses: actions/download-artifact@v1
242+
uses: actions/download-artifact@v3
243243
with:
244-
name: target
245-
path: target
244+
name: binaries
245+
path: target/debug
246246

247247
- name: Make Binaries Executable
248248
run: chmod +x $CARGO_TARGET_DIR/debug/*

tests/integration.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ fn integration_test() {
6565
.expect("unable to run clippy");
6666

6767
let stderr = String::from_utf8_lossy(&output.stderr);
68+
69+
// debug:
70+
eprintln!("{stderr}");
71+
6872
if let Some(backtrace_start) = stderr.find("error: internal compiler error") {
6973
static BACKTRACE_END_MSG: &str = "end of query stack";
7074
let backtrace_end = stderr[backtrace_start..]

0 commit comments

Comments
 (0)