X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.github%2Fdriver.sh;h=6ff189fc85926e61a2349bc3e6bc5fe370738204;hb=af721036af4e0a0cadd58962a0826dac0880cf45;hp=a2e87f5eb3745837c4a71cc2dad41a3473677bd3;hpb=779b6aeaa62d7d832bb791c7d92ed11d43f4873a;p=rust.git diff --git a/.github/driver.sh b/.github/driver.sh index a2e87f5eb37..6ff189fc859 100644 --- a/.github/driver.sh +++ b/.github/driver.sh @@ -7,9 +7,9 @@ sysroot=$(./target/debug/clippy-driver --print sysroot) test "$sysroot" = "$(rustc --print sysroot)" if [[ ${OS} == "Windows" ]]; then - desired_sysroot=C:/tmp + desired_sysroot=C:/tmp else - desired_sysroot=/tmp + desired_sysroot=/tmp fi sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot) test "$sysroot" = $desired_sysroot @@ -22,8 +22,18 @@ unset CARGO_MANIFEST_DIR # Run a lint and make sure it produces the expected output. It's also expected to exit with code 1 # FIXME: How to match the clippy invocation in compile-test.rs? -./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr && exit 1 -sed -e "s,tests/ui,\$DIR," -e "/= help/d" cstring.stderr > normalized.stderr -diff normalized.stderr tests/ui/cstring.stderr +./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/double_neg.rs 2>double_neg.stderr && exit 1 +sed -e "s,tests/ui,\$DIR," -e "/= help/d" double_neg.stderr >normalized.stderr +diff -u normalized.stderr tests/ui/double_neg.stderr + +# make sure "clippy-driver --rustc --arg" and "rustc --arg" behave the same +SYSROOT=$(rustc --print sysroot) +diff -u <(LD_LIBRARY_PATH=${SYSROOT}/lib ./target/debug/clippy-driver --rustc --version --verbose) <(rustc --version --verbose) + +echo "fn main() {}" >target/driver_test.rs +# we can't run 2 rustcs on the same file at the same time +CLIPPY=$(LD_LIBRARY_PATH=${SYSROOT}/lib ./target/debug/clippy-driver ./target/driver_test.rs --rustc) +RUSTC=$(rustc ./target/driver_test.rs) +diff -u <($CLIPPY) <($RUSTC) # TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR