diff --git a/build.sc b/build.sc index ced4926c..f57b243b 100644 --- a/build.sc +++ b/build.sc @@ -57,10 +57,6 @@ trait MiMaChecks extends Mima { ) } -object testJarWriter extends JavaModule -object testJarReader extends JavaModule -object testJarExit extends JavaModule - trait OsLibModule extends CrossScalaModule with PublishModule @@ -85,13 +81,9 @@ trait OsLibModule trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps { def ivyDeps = Agg(Deps.utest, Deps.sourcecode) - // we check the textual output of system commands and expect it in english def forkEnv = super.forkEnv() ++ Map( "LC_ALL" -> "C", - "TEST_JAR_WRITER_ASSEMBLY" -> testJarWriter.assembly().path.toString, - "TEST_JAR_READER_ASSEMBLY" -> testJarReader.assembly().path.toString, - "TEST_JAR_EXIT_ASSEMBLY" -> testJarExit.assembly().path.toString, "TEST_SUBPROCESS_ENV" -> "value" ) } @@ -122,9 +114,22 @@ trait OsModule extends OsLibModule { outer => object os extends Module { + object jvm extends Cross[OsJvmModule](scalaVersions) trait OsJvmModule extends OsModule with MiMaChecks { - object test extends ScalaTests with OsLibTestModule + object test extends ScalaTests with OsLibTestModule{ + + // we check the textual output of system commands and expect it in english + def forkEnv = super.forkEnv() ++ Map( + "TEST_JAR_WRITER_ASSEMBLY" -> testJarWriter.assembly().path.toString, + "TEST_JAR_READER_ASSEMBLY" -> testJarReader.assembly().path.toString, + "TEST_JAR_EXIT_ASSEMBLY" -> testJarExit.assembly().path.toString, + ) + + object testJarWriter extends JavaModule + object testJarReader extends JavaModule + object testJarExit extends JavaModule + } object nohometest extends ScalaTests with OsLibTestModule } diff --git a/testJarExit/src/TestJarExit.java b/os/test/testJarExit/src/TestJarExit.java similarity index 100% rename from testJarExit/src/TestJarExit.java rename to os/test/testJarExit/src/TestJarExit.java diff --git a/testJarReader/src/TestJarReader.java b/os/test/testJarReader/src/TestJarReader.java similarity index 100% rename from testJarReader/src/TestJarReader.java rename to os/test/testJarReader/src/TestJarReader.java diff --git a/testJarWriter/src/TestJarWriter.java b/os/test/testJarWriter/src/TestJarWriter.java similarity index 100% rename from testJarWriter/src/TestJarWriter.java rename to os/test/testJarWriter/src/TestJarWriter.java