Re-add node.js tests, switch to direct usage of node_utils.xml, remove node parts from update_dependencies.xml
This commit is contained in:
committed by
Vyacheslav Gerasimov
parent
7f86fb9343
commit
90e5558704
@@ -82,6 +82,19 @@ projectTest("quickTest") {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ant.importBuild(File(rootDir, "node_utils.xml"))
|
||||||
|
|
||||||
|
val prepareNode: Task = tasks["download-nodejs-and-npm"]
|
||||||
|
prepareNode.apply {
|
||||||
|
outputs.upToDateWhen { File(rootDir, "dependencies/node").exists() }
|
||||||
|
}
|
||||||
|
|
||||||
|
projectTest("nodeTest") {
|
||||||
|
workingDir = rootDir
|
||||||
|
dependsOn(prepareNode)
|
||||||
|
dependsOn("run-nodejs-tests")
|
||||||
|
}
|
||||||
|
|
||||||
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
|
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
|
||||||
val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
|
val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
|
||||||
|
|
||||||
|
|||||||
@@ -171,18 +171,6 @@
|
|||||||
</patternset>
|
</patternset>
|
||||||
<mapper type="flatten"/>
|
<mapper type="flatten"/>
|
||||||
</unzip>
|
</unzip>
|
||||||
|
|
||||||
<download_teamcity_artifact
|
|
||||||
teamcity.server.url="https://teamcity.jetbrains.com"
|
|
||||||
build.locator.request="${markdown.locator}"
|
|
||||||
artifact.path="markdown_jar/markdown.jar"
|
|
||||||
dest="${dependencies}/markdown.jar"
|
|
||||||
usetimestamp="true"
|
|
||||||
build.number.pattern="\d+\s-\sKotlin\s[\w-+\.]+"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- node.js -->
|
|
||||||
<antcall target="download-nodejs-and-npm"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<macrodef name="download_teamcity_artifact">
|
<macrodef name="download_teamcity_artifact">
|
||||||
|
|||||||
Reference in New Issue
Block a user