Skip to content

Commit 697cd1a

Browse files
committed
.
1 parent 56f2fb4 commit 697cd1a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build.sc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ trait OsLibModule
8787
// we check the textual output of system commands and expect it in english
8888
def forkEnv = super.forkEnv() ++ Map(
8989
"LC_ALL" -> "C",
90-
"TEST_SUBPROCESS_ENV" -> "value"
90+
"TEST_SUBPROCESS_ENV" -> "value",
91+
"OS_TEST_RESOURCE_FOLDER" -> os.jvm(crossValue).test.resources().head.path.toString
9192
)
9293
}
9394
}
@@ -177,6 +178,7 @@ object os extends Module {
177178
def ivyDeps = Agg(Deps.jna)
178179
object test extends ScalaTests with OsLibTestModule {
179180
def moduleDeps = super.moduleDeps ++ Seq(os.jvm().test)
181+
180182
}
181183
}
182184
}

os/test/src/TestUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ object TestUtil {
5757
}
5858
)
5959

60-
val original = Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER"), "test")
60+
val original = Paths.get(sys.env("OS_TEST_RESOURCE_FOLDER"), "test")
6161
Files.walkFileTree(
6262
original,
6363
new SimpleFileVisitor[Path]() {

0 commit comments

Comments
 (0)