Fixes after rebase

This commit is contained in:
Ilya Chernikov
2017-12-21 08:57:36 +01:00
committed by Vyacheslav Gerasimov
parent 172a29ba04
commit 2dc4769c0a
3 changed files with 2 additions and 15 deletions
-14
View File
@@ -42,7 +42,6 @@ dependencies {
antLauncherJar(files(toolsJar()))
}
sourceSets {
"main" {}
"test" { projectDefault() }
@@ -78,19 +77,6 @@ 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 testDataDir = project(":js:js.translator").projectDir.resolve("testData")