build: change the logic for building ts files before js tests run.

This commit is contained in:
Artem Kobzar
2022-02-23 10:28:02 +00:00
committed by Space
parent 261cac7514
commit 9c5c31bdcb
2 changed files with 23 additions and 11 deletions
+22 -10
View File
@@ -171,19 +171,32 @@ val unzipV8 by task<Copy> {
}
val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
val typescriptTestsDir = testDataDir.resolve("typescript-export")
val installTsDependencies by task<NpmTask> {
val installTsDependencies = task<NpmTask>("installTsDependencies") {
workingDir.set(testDataDir)
args.set(listOf("install"))
}
val generateTypeScriptTests by task<NpmTask> {
dependsOn(installTsDependencies)
workingDir.set(testDataDir)
args.set(listOf("run", "generateTypeScriptTests"))
fun sequential(first: Task, tasks: List<Task>): Task {
tasks.fold(first) { previousTask, currentTask ->
currentTask.dependsOn(previousTask)
}
return tasks.last()
}
fun generateTypeScriptTestFor(dir: String): Task = task<NpmTask>("generate-ts-for-$dir") {
workingDir.set(testDataDir)
args.set(listOf("run", "generateTypeScriptTests", "--", "./typescript-export/$dir/tsconfig.json"))
}
val generateTypeScriptTests = sequential(
installTsDependencies,
typescriptTestsDir.listFiles()
.filter { it.isDirectory }
.map { generateTypeScriptTestFor(it.name) }
)
fun Test.setupV8() {
dependsOn(unzipV8)
val v8Path = unzipV8.get().destinationDir
@@ -205,10 +218,9 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean) {
dependsOn(":dist")
// TODO uncomment after fixing on Windows
// if (!project.hasProperty("teamcity")) {
// dependsOn(generateTypeScriptTests)
// }
if (!project.hasProperty("teamcity")) {
dependsOn(generateTypeScriptTests)
}
if (jsEnabled) {
dependsOn(testJsRuntime)
+1 -1
View File
@@ -11,6 +11,6 @@
"runOnTeamcity": "mocha --reporter mocha-teamcity-reporter",
"test": "mocha",
"runIrTestInNode": "node $NODE_DEBUG_OPTION runIrTestInNode.js",
"generateTypeScriptTests": "tsc --build typescript-export/*/"
"generateTypeScriptTests": "tsc --build"
}
}