Merge remote-tracking branch 'origin/main' into checker

Author: ajaychandran

.mill-version

@@ -1 +1 @@
-0.11.12
+0.12.0

build.sc build.millbuild.sc renamed to build.mill

@@ -1,3 +1,4 @@
+package build
 // plugins
 import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
 import $ivy.`com.github.lolgab::mill-mima::0.1.1`
@@ -104,7 +105,8 @@ trait OsLibModule
     // we check the textual output of system commands and expect it in english
     def forkEnv = super.forkEnv() ++ Map(
       "LC_ALL" -> "C",
-      "TEST_SUBPROCESS_ENV" -> "value"
+      "TEST_SUBPROCESS_ENV" -> "value",
+      "OS_TEST_RESOURCE_FOLDER" -> os.jvm(crossValue).test.resources().head.path.toString
     )
   }
 }
@@ -209,6 +211,7 @@ object os extends Module {
       def ivyDeps = Agg(Deps.jna)
       object test extends ScalaTests with OsLibTestModule {
         def moduleDeps = super.moduleDeps ++ Seq(os.jvm().test)
+
       }
     }
   }

mill

@@ -7,7 +7,7 @@
 set -e
 
 if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
-  DEFAULT_MILL_VERSION=0.11.0
+  DEFAULT_MILL_VERSION=0.11.12
 fi
 
 if [ -z "$MILL_VERSION" ] ; then
@@ -53,7 +53,9 @@ if [ -z "$MILL_MAIN_CLI" ] ; then
 fi
 
 MILL_FIRST_ARG=""
-if [ "$1" = "--bsp" ] || [ "$1" = "-i" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
+
+ # first arg is a long flag for "--interactive" or starts with "-i"
+if [ "$1" = "--bsp" ] || [ "${1#"-i"}" != "$1" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
   # Need to preserve the first position of those listed options
   MILL_FIRST_ARG=$1
   shift

os/test/src-jvm/ExampleTests.scala

@@ -254,7 +254,7 @@ object ExampleTests extends TestSuite {
     }
     test("findWc") {
 
-      val wd = os.pwd / "os/test/resources/test"
+      val wd = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
 
       // find . -name '*.txt' | xargs wc -l
       val lines = os.walk(wd)

os/test/src-jvm/OpTestsJvmOnly.scala

@@ -10,7 +10,7 @@ import java.nio.charset.Charset
 object OpTestsJvmOnly extends TestSuite {
 
   val tests = Tests {
-    val res = os.pwd / "os/test/resources/test"
+    val res = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
     val testFolder = os.pwd / "out/scratch/test"
     test("lsRecPermissions") {
       if (Unix()) {
@@ -74,7 +74,7 @@ object OpTestsJvmOnly extends TestSuite {
     // Not sure why this doesn't work on native
     test("redirectSubprocessInheritedOutput") {
       if (Unix()) { // relies on bash scripts that don't run on windows
-        val scriptFolder = os.pwd / "os/test/resources/test"
+        val scriptFolder = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
         val lines = collection.mutable.Buffer.empty[String]
         os.Inherit.out.withValue(os.ProcessOutput.Readlines(lines.append(_))) {
           // Redirected

os/test/src-jvm/ProcessPipelineTests.scala

@@ -9,7 +9,7 @@ import TestUtil.prep
 import scala.util.Try
 
 object ProcessPipelineTests extends TestSuite {
-  val scriptFolder = pwd / "os/test/resources/scripts"
+  val scriptFolder = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "scripts"
 
   lazy val scalaHome = sys.env("SCALA_HOME")
 

os/test/src/OpTests.scala

@@ -10,7 +10,7 @@ import java.nio.charset.Charset
 object OpTests extends TestSuite {
 
   val tests = Tests {
-    val res = os.pwd / "os/test/resources/test"
+    val res = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
     test("ls") - assert(
       os.list(res).toSet == Set(
         res / "folder1",

os/test/src/SubprocessTests.scala

@@ -9,7 +9,7 @@ import utest._
 import scala.collection.mutable
 
 object SubprocessTests extends TestSuite {
-  val scriptFolder = pwd / "os/test/resources/test"
+  val scriptFolder = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
 
   val lsCmd = if (scala.util.Properties.isWin) "dir" else "ls"
 
@@ -38,6 +38,8 @@ object SubprocessTests extends TestSuite {
       }
     }
     test("chained") {
+      proc("git", "init").call()
+      os.write.over(os.pwd / "Readme.adoc", "hello")
       assert(
         proc("git", "init").call().out.text().contains("Reinitialized existing Git repository"),
         proc("git", "init").call().out.text().contains("Reinitialized existing Git repository"),
@@ -46,6 +48,8 @@ object SubprocessTests extends TestSuite {
     }
     test("basicList") {
       val files = List("Readme.adoc", "build.sc")
+      os.write.over(os.pwd / "Readme.adoc", "hello")
+      os.write.over(os.pwd / "build.sc", "world")
       val output = TestUtil.proc(lsCmd, files).call().out.text()
       assert(files.forall(output.contains))
     }
@@ -193,7 +197,7 @@ object SubprocessTests extends TestSuite {
       }
       test("jarTf") {
         // This was the original repro for the multi-chunk concurrency bugs
-        val jarFile = os.pwd / "os/test/resources/misc/out.jar"
+        val jarFile = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "misc/out.jar"
         assert(TestUtil.eqIgnoreNewlineStyle(
           os.proc("jar", "-tf", jarFile).call().out.text(),
           """META-INF/MANIFEST.MF

os/test/src/TestUtil.scala

@@ -57,7 +57,7 @@ object TestUtil {
       }
     )
 
-    val original = Paths.get("os", "test", "resources", "test")
+    val original = Paths.get(sys.env("OS_TEST_RESOURCE_FOLDER"), "test")
     Files.walkFileTree(
       original,
       new SimpleFileVisitor[Path]() {