Extract driver test

rust-lang · Jan 26, 2020 · 34f3702 · 34f3702
1 parent a1f6565
commit 34f3702
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 54 deletions.
diff --git a/.github/driver.sh b/.github/driver.sh
@@ -0,0 +1,29 @@
+#! /bin/bash
+
+set -ex
+
+# Check sysroot handling
+sysroot=$(./target/debug/clippy-driver --print sysroot)
+test "$sysroot" = "$(rustc --print sysroot)"
+
+if [[ ${OS} == "Windows" ]]; then
+  desired_sysroot=C:/tmp
+else
+  desired_sysroot=/tmp
+fi
+sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
+test "$sysroot" = $desired_sysroot
+
+sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
+test "$sysroot" = $desired_sysroot
+
+# Make sure this isn't set - clippy-driver should cope without it
+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
+
+# TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -68,31 +68,9 @@ jobs:
       run: ../target/debug/cargo-clippy
       working-directory: clippy_workspace_tests
     - name: Test clippy-driver
-      run: |
-        (
-          set -ex
-          # Check sysroot handling
-          sysroot=$(./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = "$(rustc --print sysroot)"
-
-          desired_sysroot=/tmp
-          sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          # Make sure this isn't set - clippy-driver should cope without it
-          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
-
-          # TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
-        )
+      run: bash .github/driver.sh
+      env:
+        OS: ${{ runner.os }}
 
     - name: Run cargo-cache --autoclean
       run: |

diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
@@ -136,36 +136,10 @@ jobs:
       shell: bash
       working-directory: clippy_workspace_tests
     - name: Test clippy-driver
-      run: |
-        (
-          set -ex
-          # Check sysroot handling
-          sysroot=$(./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = "$(rustc --print sysroot)"
-
-          if [[ ${{ runner.os }} == "Windows" ]]; then
-            desired_sysroot=C:/tmp
-          else
-            desired_sysroot=/tmp
-          fi
-          sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          # Make sure this isn't set - clippy-driver should cope without it
-          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
-
-          # TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
-        )
+      run: bash .github/driver.sh
       shell: bash
+      env:
+        OS: ${{ runner.os }}
 
     - name: Run cargo-cache --autoclean
       run: |