summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 20:01:45 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 20:01:45 -0800
commit74c4751ffc5abcc08f6dae0a336d76549161b444 (patch)
treec7bec41df9bcc69908c251084baa12d4b891cac6
parent9f0c37890a788fff9ff733d2c2a3cb8a9b74f96b (diff)
downloadmill-74c4751ffc5abcc08f6dae0a336d76549161b444.tar.gz
mill-74c4751ffc5abcc08f6dae0a336d76549161b444.tar.bz2
mill-74c4751ffc5abcc08f6dae0a336d76549161b444.zip
re-enable better-files test but with a newer version with offending CI-failure commented out
-rw-r--r--build.sbt2
-rwxr-xr-xbuild.sc2
-rw-r--r--integration/test/src/mill/integration/BetterFilesTests.scala6
3 files changed, 7 insertions, 3 deletions
diff --git a/build.sbt b/build.sbt
index 7d46e889..b750546f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -209,7 +209,7 @@ val testRepos = Map(
),
"MILL_BETTERFILES_REPO" -> ammoniteRun(
resourceManaged in test,
- List("shared.sc", "downloadTestRepo", "pathikrit/better-files", "e235722f91f78b8f34a41b8332d7fae3e8a64141", _),
+ List("shared.sc", "downloadTestRepo", "pathikrit/better-files", "ba74ae9ef784dcf37f1b22c3990037a4fcc6b5f8", _),
suffix = "better-files"
),
"MILL_AMMONITE_REPO" -> ammoniteRun(
diff --git a/build.sc b/build.sc
index 73b98061..a2062409 100755
--- a/build.sc
+++ b/build.sc
@@ -162,7 +162,7 @@ def testRepos = T{
"MILL_JAWN_REPO" ->
shared.downloadTestRepo("non/jawn", "fd8dc2b41ce70269889320aeabf8614fe1e8fbcb", T.ctx().dest/"jawn"),
"MILL_BETTERFILES_REPO" ->
- shared.downloadTestRepo("pathikrit/better-files", "e235722f91f78b8f34a41b8332d7fae3e8a64141", T.ctx().dest/"better-files"),
+ shared.downloadTestRepo("pathikrit/better-files", "ba74ae9ef784dcf37f1b22c3990037a4fcc6b5f8", T.ctx().dest/"better-files"),
"MILL_AMMONITE_REPO" ->
shared.downloadTestRepo("lihaoyi/ammonite", "96ea548d5e3b72ab6ad4d9765e205bf6cc1c82ac", T.ctx().dest/"ammonite")
)
diff --git a/integration/test/src/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala
index 348b9023..7ee943df 100644
--- a/integration/test/src/mill/integration/BetterFilesTests.scala
+++ b/integration/test/src/mill/integration/BetterFilesTests.scala
@@ -8,10 +8,14 @@ object BetterFilesTests extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "b
initWorkspace()
'test - {
- assert(eval("core.test.compile"))
+ assert(eval("core.test"))
assert(eval("akka.test"))
assert(eval("benchmarks.test.compile"))
+ val coreTestMeta = meta("core.test.test")
+ assert(coreTestMeta.contains("better.files.FileSpec"))
+ assert(coreTestMeta.contains("files should handle BOM"))
+
for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){
write.append(scalaFile, "\n}")
}