From 69ed60653c59b445bb1d0a2d001b6eae2854a5a8 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 16 Jul 2019 11:46:55 -0700 Subject: [PATCH] Add scripted test for excludeFilter It was reported in #4868 that exclueFilters didn't work correctly if there was an || in the filter. This was an upstream issue in io, but this commit adds a scripted test in sbt. --- sbt/src/sbt-test/nio/legacy-filters/build.sbt | 8 ++++++++ .../sbt-test/nio/legacy-filters/src/main/scala/Bar.scala | 1 + .../sbt-test/nio/legacy-filters/src/main/scala/Foo.scala | 1 + sbt/src/sbt-test/nio/legacy-filters/test | 9 +++++++++ 4 files changed, 19 insertions(+) create mode 100644 sbt/src/sbt-test/nio/legacy-filters/build.sbt create mode 100644 sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Bar.scala create mode 100644 sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Foo.scala create mode 100644 sbt/src/sbt-test/nio/legacy-filters/test diff --git a/sbt/src/sbt-test/nio/legacy-filters/build.sbt b/sbt/src/sbt-test/nio/legacy-filters/build.sbt new file mode 100644 index 000000000..2be01658b --- /dev/null +++ b/sbt/src/sbt-test/nio/legacy-filters/build.sbt @@ -0,0 +1,8 @@ +Compile / excludeFilter := "Bar.scala" || "Baz.scala" + +val checkSources = inputKey[Unit]("Check that the compile sources match the input file names") +checkSources := { + val sources = Def.spaceDelimited("").parsed.toSet + val actual = (Compile / unmanagedSources).value.map(_.getName).toSet + assert(sources == actual) +} diff --git a/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Bar.scala b/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Bar.scala new file mode 100644 index 000000000..afa08f013 --- /dev/null +++ b/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Bar.scala @@ -0,0 +1 @@ +class Bar { \ No newline at end of file diff --git a/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Foo.scala b/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Foo.scala new file mode 100644 index 000000000..43c42f145 --- /dev/null +++ b/sbt/src/sbt-test/nio/legacy-filters/src/main/scala/Foo.scala @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/sbt/src/sbt-test/nio/legacy-filters/test b/sbt/src/sbt-test/nio/legacy-filters/test new file mode 100644 index 000000000..ae779a65c --- /dev/null +++ b/sbt/src/sbt-test/nio/legacy-filters/test @@ -0,0 +1,9 @@ +> checkSources Foo.scala + +> compile + +> set Compile / excludeFilter := HiddenFileFilter + +> checkSources Foo.scala Bar.scala + +-> compile \ No newline at end of file