summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby <robby@santoslab.org>2018-03-07 11:56:46 -0600
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-07 09:56:46 -0800
commit5ae886d7046a9f89382cbb2ab5644ca246b62ca5 (patch)
tree65ea980fed93b3d448ff4eb6772fa700b1fb7dd3
parentf5250de09594fe526647eac7713b403d244a7475 (diff)
downloadmill-5ae886d7046a9f89382cbb2ab5644ca246b62ca5.tar.gz
mill-5ae886d7046a9f89382cbb2ab5644ca246b62ca5.tar.bz2
mill-5ae886d7046a9f89382cbb2ab5644ca246b62ca5.zip
Added AppVeyor configuration and made JavaCompilerJarTests compatible with Windows (#207)
* Added AppVeyor config. * Made JavaCompilerJarTests compatible with Windows. * Disabled scalalib.test for now due to issues with Windows path length limit.
-rw-r--r--.appveyor.yml28
-rw-r--r--main/test/src/mill/eval/JavaCompileJarTests.scala8
2 files changed, 32 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 00000000..8fa75778
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,28 @@
+version: 1.0.{build}
+
+image: Visual Studio 2017
+
+init:
+ - cmd: git config --global core.autocrlf true
+
+clone_folder: c:\mill
+
+environment:
+ matrix:
+ - COMPILER: msys2
+ PLATFORM: x64
+ MSYS2_ARCH: x86_64
+ MSYS2_DIR: msys64
+ MSYSTEM: MINGW64
+ BIT: 64
+ JAVA_HOME: 'C:\Program Files\Java\jdk1.8.0'
+ PATH: '%JAVA_HOME%\bin;C:\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%'
+
+cache:
+ - '%LOCALAPPDATA%\Coursier\cache'
+
+install:
+ - bash -lc "mkdir /c/bin && curl -Lo /c/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.4/0.1.4-12-f5250d"
+
+build_script:
+ - bash -lc "cd /c/mill && mill -i all main.test scalajslib.test"
diff --git a/main/test/src/mill/eval/JavaCompileJarTests.scala b/main/test/src/mill/eval/JavaCompileJarTests.scala
index 0921ae6d..78cf09a5 100644
--- a/main/test/src/mill/eval/JavaCompileJarTests.scala
+++ b/main/test/src/mill/eval/JavaCompileJarTests.scala
@@ -117,14 +117,14 @@ object JavaCompileJarTests extends TestSuite{
assert(jarContents == expectedJarContents)
val executed = %%('java, "-cp", evaluator.outPath/'jar/'dest/"out.jar", "test.Foo")(evaluator.outPath).out.string
- assert(executed == (31337 + 271828) + "\n")
+ assert(executed == (31337 + 271828) + System.lineSeparator)
for(i <- 0 until 3){
// Build.run is not cached, so every time we eval it it has to
// re-evaluate
val Right((runOutput, evalCount)) = eval(Build.run("test.Foo"))
assert(
- runOutput.out.string == (31337 + 271828) + "\n",
+ runOutput.out.string == (31337 + 271828) + System.lineSeparator,
evalCount == 1
)
}
@@ -145,12 +145,12 @@ object JavaCompileJarTests extends TestSuite{
)
val Right((runOutput2, evalCount2)) = eval(Build.run("test.BarFour"))
assert(
- runOutput2.out.string == "New Cls!\n",
+ runOutput2.out.string == "New Cls!" + System.lineSeparator,
evalCount2 == 3
)
val Right((runOutput3, evalCount3)) = eval(Build.run("test.BarFour"))
assert(
- runOutput3.out.string == "New Cls!\n",
+ runOutput3.out.string == "New Cls!" + System.lineSeparator,
evalCount3 == 1
)
}