Skip to content

Commit 4f1240f

Browse files
committed
Auto merge of rust-lang#6263 - matthiaskrgr:diff_u, r=ebroto
use diff -u in driver.sh test this changs the add/delete indication from > > < to + + - (same as git diff) changelog: none
2 parents 645ef50 + 0d6eed1 commit 4f1240f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/driver.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ unset CARGO_MANIFEST_DIR
2424
# FIXME: How to match the clippy invocation in compile-test.rs?
2525
./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/double_neg.rs 2> double_neg.stderr && exit 1
2626
sed -e "s,tests/ui,\$DIR," -e "/= help/d" double_neg.stderr > normalized.stderr
27-
diff normalized.stderr tests/ui/double_neg.stderr
27+
diff -u normalized.stderr tests/ui/double_neg.stderr
2828

2929

3030
# make sure "clippy-driver --rustc --arg" and "rustc --arg" behave the same
3131
SYSROOT=`rustc --print sysroot`
32-
diff <(LD_LIBRARY_PATH=${SYSROOT}/lib ./target/debug/clippy-driver --rustc --version --verbose) <(rustc --version --verbose)
32+
diff -u <(LD_LIBRARY_PATH=${SYSROOT}/lib ./target/debug/clippy-driver --rustc --version --verbose) <(rustc --version --verbose)
3333

3434

3535
echo "fn main() {}" > target/driver_test.rs
3636
# we can't run 2 rustcs on the same file at the same time
3737
CLIPPY=`LD_LIBRARY_PATH=${SYSROOT}/lib ./target/debug/clippy-driver ./target/driver_test.rs --rustc`
3838
RUSTC=`rustc ./target/driver_test.rs`
39-
diff <($CLIPPY) <($RUSTC)
39+
diff -u <($CLIPPY) <($RUSTC)
4040

4141
# TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR

0 commit comments

Comments
 (0)