diff --git a/src/it/scala/inox/ResourceUtils.scala b/src/it/scala/inox/ResourceUtils.scala index 3297b44f61445c3fe9c9aa774921d140921ac255..c43039166cd3392a50e8093042e291c25b1fd3c0 100644 --- a/src/it/scala/inox/ResourceUtils.scala +++ b/src/it/scala/inox/ResourceUtils.scala @@ -14,17 +14,19 @@ trait ResourceUtils { val resourcesDir = "src/it/resources" def resourceFiles(dir: String, filter: String => Boolean = (s: String) => true, recursive: Boolean = false): Seq[File] = { - val baseDir = new File(getClass.getResource(s"/$dir").getPath) - - def rec(f: File): Seq[File] = Option(f.listFiles()).getOrElse(Array()).flatMap { f => - if (f.isDirectory) { - if (recursive) rec(f) - else Nil - } else { - List(f) + Option(getClass.getResource(s"/$dir")).toSeq.flatMap { url => + val baseDir = new File(url.getPath) + + def rec(f: File): Seq[File] = Option(f.listFiles()).getOrElse(Array()).flatMap { f => + if (f.isDirectory) { + if (recursive) rec(f) + else Nil + } else { + List(f) + } } - } - rec(baseDir).filter(f => filter(f.getPath)).toSeq.sortBy(_.getPath) + rec(baseDir).filter(f => filter(f.getPath)).toSeq.sortBy(_.getPath) + } } } diff --git a/src/it/scala/inox/tip/TIPTestSuite.scala b/src/it/scala/inox/tip/TIPTestSuite.scala index 19f91fe853a9abae2243bbc2acde8b769b9dcdeb..bed25e0b84fd94e535264e336e8a0540a0d39625 100644 --- a/src/it/scala/inox/tip/TIPTestSuite.scala +++ b/src/it/scala/inox/tip/TIPTestSuite.scala @@ -9,7 +9,7 @@ import org.scalatest.concurrent._ import solvers._ import utils._ -trait TIPTestSuite extends InoxTestSuite with ResourceUtils { +class TIPTestSuite extends InoxTestSuite with ResourceUtils { val tipDir = "tip-benchmarks"