.

Author: lihaoyi

os/test/src-jvm/ExampleTests.scala

@@ -254,7 +254,7 @@ object ExampleTests extends TestSuite {
     }
     test("findWc") {
 
-      val wd = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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 = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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 = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "test"
+  val scriptFolder = os.Path(sys.env("OS_TEST_RESOURCE_FOLDER")) / "test"
 
   val lsCmd = if (scala.util.Properties.isWin) "dir" else "ls"
 
@@ -197,7 +197,7 @@ object SubprocessTests extends TestSuite {
       }
       test("jarTf") {
         // This was the original repro for the multi-chunk concurrency bugs
-        val jarFile = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) / "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