From 5d8b3e7dd9881fbb70b9836e9399f1228e20e0ee Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 5 May 2016 21:45:52 -0400 Subject: [PATCH] Remove int-ant-style test --- .../compiler-project/inc-ant-style/build.sbt | 30 ------------------- .../inc-ant-style/changes/A1.scala | 3 -- .../inc-ant-style/src/main/scala/A.scala | 5 ---- .../inc-ant-style/src/main/scala/B.scala | 3 -- .../inc-ant-style/src/main/scala/C.scala | 5 ---- .../compiler-project/inc-ant-style/test | 8 ----- 6 files changed, 54 deletions(-) delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/changes/A1.scala delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/A.scala delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/B.scala delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/C.scala delete mode 100644 sbt/src/sbt-test/compiler-project/inc-ant-style/test diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt b/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt deleted file mode 100644 index c00ed3d45..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt +++ /dev/null @@ -1,30 +0,0 @@ -logLevel := Level.Debug - -incOptions := incOptions.value.withNameHashing(false).withAntStyle(true) - -/* Performs checks related to compilations: - * a) checks in which compilation given set of files was recompiled - * b) checks overall number of compilations performed - */ -TaskKey[Unit]("check-compilations") := { - val analysis = (compile in Compile).value match { case analysis: Analysis => analysis } - val srcDir = (scalaSource in Compile).value - def relative(f: java.io.File): java.io.File = f.relativeTo(srcDir) getOrElse f - val allCompilations = analysis.compilations.allCompilations - val recompiledFiles: Seq[Set[java.io.File]] = allCompilations map { c => - val recompiledFiles = analysis.apis.internal.collect { - case (file, api) if api.compilation.startTime == c.startTime => relative(file) - } - recompiledFiles.toSet - } - def recompiledFilesInIteration(iteration: Int, fileNames: Set[String]) = { - val files = fileNames.map(new java.io.File(_)) - assert(recompiledFiles(iteration) == files, "%s != %s".format(recompiledFiles(iteration), files)) - } - assert(allCompilations.size == 2) - // B.scala and C.scala are compiled at the beginning, in the Ant-style incremental compilation - // they are not rebuild when A.scala. - recompiledFilesInIteration(0, Set("B.scala", "C.scala")) - // A.scala is changed and recompiled - recompiledFilesInIteration(1, Set("A.scala")) -} diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/changes/A1.scala b/sbt/src/sbt-test/compiler-project/inc-ant-style/changes/A1.scala deleted file mode 100644 index e86bab42e..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/changes/A1.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test3 - -trait A \ No newline at end of file diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/A.scala b/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/A.scala deleted file mode 100644 index 4ab580616..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/A.scala +++ /dev/null @@ -1,5 +0,0 @@ -package test3 - -trait A { - def foo = 1 -} diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/B.scala b/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/B.scala deleted file mode 100644 index 572e3c764..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/B.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test3 - -trait B extends A diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/C.scala b/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/C.scala deleted file mode 100644 index c8b935590..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/src/main/scala/C.scala +++ /dev/null @@ -1,5 +0,0 @@ -package test3 - -trait C { - def abc(a: A): Int = a.foo -} diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/test b/sbt/src/sbt-test/compiler-project/inc-ant-style/test deleted file mode 100644 index f6d94fc14..000000000 --- a/sbt/src/sbt-test/compiler-project/inc-ant-style/test +++ /dev/null @@ -1,8 +0,0 @@ -# introduces first compile iteration -> compile -# remove A.foo method -$ copy-file changes/A1.scala src/main/scala/A.scala -# recompiles just A.scala in Ant mode so it introduces one more iteration -> compile -# check if there are only two compile iterations performed -> check-compilations