Skip to content

Commit 6ab4c65

Browse files
authored
Move test projects into os/test/ folder (#289)
They aren't important enough to be top-level folders, since they really belong to the test suite
1 parent c422212 commit 6ab4c65

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

build.sc

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ trait MiMaChecks extends Mima {
5757
)
5858
}
5959

60-
object testJarWriter extends JavaModule
61-
object testJarReader extends JavaModule
62-
object testJarExit extends JavaModule
63-
6460
trait OsLibModule
6561
extends CrossScalaModule
6662
with PublishModule
@@ -85,13 +81,9 @@ trait OsLibModule
8581

8682
trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps {
8783
def ivyDeps = Agg(Deps.utest, Deps.sourcecode)
88-
8984
// we check the textual output of system commands and expect it in english
9085
def forkEnv = super.forkEnv() ++ Map(
9186
"LC_ALL" -> "C",
92-
"TEST_JAR_WRITER_ASSEMBLY" -> testJarWriter.assembly().path.toString,
93-
"TEST_JAR_READER_ASSEMBLY" -> testJarReader.assembly().path.toString,
94-
"TEST_JAR_EXIT_ASSEMBLY" -> testJarExit.assembly().path.toString,
9587
"TEST_SUBPROCESS_ENV" -> "value"
9688
)
9789
}
@@ -122,9 +114,22 @@ trait OsModule extends OsLibModule { outer =>
122114

123115
object os extends Module {
124116

117+
125118
object jvm extends Cross[OsJvmModule](scalaVersions)
126119
trait OsJvmModule extends OsModule with MiMaChecks {
127-
object test extends ScalaTests with OsLibTestModule
120+
object test extends ScalaTests with OsLibTestModule{
121+
122+
// we check the textual output of system commands and expect it in english
123+
def forkEnv = super.forkEnv() ++ Map(
124+
"TEST_JAR_WRITER_ASSEMBLY" -> testJarWriter.assembly().path.toString,
125+
"TEST_JAR_READER_ASSEMBLY" -> testJarReader.assembly().path.toString,
126+
"TEST_JAR_EXIT_ASSEMBLY" -> testJarExit.assembly().path.toString,
127+
)
128+
129+
object testJarWriter extends JavaModule
130+
object testJarReader extends JavaModule
131+
object testJarExit extends JavaModule
132+
}
128133
object nohometest extends ScalaTests with OsLibTestModule
129134
}
130135

File renamed without changes.

0 commit comments

Comments
 (0)