@@ -6,6 +6,7 @@ import io.kotest.assertions.throwables.shouldNotThrowAny
6
6
import io.kotest.assertions.withClue
7
7
import io.kotest.core.spec.style.FunSpec
8
8
import io.kotest.matchers.shouldBe
9
+ import io.kotest.mpp.env
9
10
import kotlinx.serialization.ExperimentalSerializationApi
10
11
import kotlinx.serialization.Serializable
11
12
import kotlinx.serialization.builtins.ListSerializer
@@ -50,10 +51,12 @@ internal fun FunSpec.runTestSuites(
50
51
val testSuiteDir = when {
51
52
fs.exists(TEST_SUITES_DIR ) -> TEST_SUITES_DIR
52
53
fs.exists(TEST_SUITES_DIR_FROM_ROOT ) -> TEST_SUITES_DIR_FROM_ROOT
53
- else -> fs.resolveRoot ()
54
+ else -> env( TEST_SUITES_DIR_ENV_VAR )?.toPath ()
54
55
}?.resolve(draftName)
55
- ? : error(" neither $TEST_SUITES_DIR or $TEST_SUITES_DIR_FROM_ROOT exist " +
56
- " (current dir: ${fs.canonicalize(" ." .toPath())} )" )
56
+ ? : error(
57
+ " neither $TEST_SUITES_DIR or $TEST_SUITES_DIR_FROM_ROOT exist " +
58
+ " (current dir: ${fs.canonicalize(" ." .toPath())} , env: ${env(TEST_SUITES_DIR_ENV_VAR )} )" ,
59
+ )
57
60
58
61
require(fs.exists(testSuiteDir)) { " folder $testSuiteDir does not exist" }
59
62
@@ -134,17 +137,6 @@ private class SchemaTest(
134
137
135
138
private val TEST_SUITES_DIR : Path = " schema-test-suite/tests" .toPath()
136
139
private val TEST_SUITES_DIR_FROM_ROOT : Path = " test-suites" .toPath() / TEST_SUITES_DIR
137
-
138
- /* *
139
- * This function tries to find the repo root using `build` folder as maker.
140
- *
141
- * This is done in order to execute NodeJS tests
142
- */
143
- private fun FileSystem.resolveRoot (): Path ? {
144
- val absolutePath = canonicalize(" ." .toPath())
145
- return generateSequence(absolutePath) {
146
- it.parent
147
- }.find { it.name == " build" }?.parent?.resolve(TEST_SUITES_DIR_FROM_ROOT )
148
- }
140
+ private const val TEST_SUITES_DIR_ENV_VAR : String = " TEST_SUITES_DIR"
149
141
150
142
expect fun fileSystem (): FileSystem
0 commit comments