Skip to content

Commit 88b81dd

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 + 3246de3 commit 88b81dd

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.github/workflows/clippy_bors.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,14 @@ jobs:
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'
@@ -239,21 +234,32 @@ jobs:
239234

240235
# Download
241236
- name: Download target dir
242-
uses: actions/download-artifact@v1
237+
uses: actions/download-artifact@v3
243238
with:
244-
name: target
245-
path: target
239+
name: binaries
240+
path: target/debug
246241

247242
- name: Make Binaries Executable
248243
run: chmod +x $CARGO_TARGET_DIR/debug/*
249244

250-
# Run
245+
# Run # this fails
251246
- name: Test ${{ matrix.integration }}
247+
env:
248+
INTEGRATION: ${{ matrix.integration }}
252249
run: |
253250
RUSTUP_TOOLCHAIN="$(rustup show active-toolchain | grep -o -E "nightly-[0-9]{4}-[0-9]{2}-[0-9]{2}")" \
254251
$CARGO_TARGET_DIR/debug/integration
252+
253+
- name: Test ${{ matrix.integration }} echo
255254
env:
256255
INTEGRATION: ${{ matrix.integration }}
256+
run: echo integration "${INTEGRATION}"
257+
258+
- name: Test ${{ matrix.integration }} peek into dir
259+
env:
260+
INTEGRATION: ${{ matrix.integration }}
261+
run: ls -c1 $CARGO_TARGET_DIR/debug/
262+
257263

258264
# These jobs doesn't actually test anything, but they're only used to tell
259265
# bors the build completed, as there is no practical way to detect when a

tests/integration.rs

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

6767
let stderr = String::from_utf8_lossy(&output.stderr);
68+
dbg!(&stderr);
6869
if let Some(backtrace_start) = stderr.find("error: internal compiler error") {
6970
static BACKTRACE_END_MSG: &str = "end of query stack";
7071
let backtrace_end = stderr[backtrace_start..]

0 commit comments

Comments
 (0)