File tree Expand file tree Collapse file tree 4 files changed +9
-29
lines changed
tests/codegen/smoke-tests Expand file tree Collapse file tree 4 files changed +9
-29
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ concurrency:
1111
1212env :
1313 RUN : ${{ github.run_id }}-${{ github.run_number }}
14- GRADLE_OPTS : " -Dorg.gradle.daemon.idletimeout=60000 -Dkotlin.incremental=false"
14+ GRADLE_OPTS : " -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
1515
1616jobs :
1717 jvm :
Original file line number Diff line number Diff line change @@ -5,13 +5,6 @@ kotlin.native.ignoreDisabledTargets=true
55# gradle
66org.gradle.jvmargs =-Xmx6g -XX:MaxMetaspaceSize=2G
77
8- # temp debugging properties
9- org.gradle.internal.http.connectionTimeout =120_000
10- org.gradle.internal.http.socketTimeout =120_000
11- org.gradle.internal.https.connectionTimeout =120_000
12- org.gradle.internal.https.socketTimeout =120_000
13- org.gradle.internal.timeout =120_000
14-
158# sdk
169sdkVersion =1.3.18-SNAPSHOT
1710
Original file line number Diff line number Diff line change @@ -32,9 +32,9 @@ fun configureProject() {
3232 codegen(libs.smithy.model)
3333
3434 implementation(libs.smithy.kotlin.codegen)
35- implementation(" org.gradle:gradle-tooling-api:+" )
3635
3736 testImplementation(libs.kotlin.test)
37+ testImplementation(gradleTestKit())
3838 }
3939}
4040
Original file line number Diff line number Diff line change 1- import org.gradle.tooling.GradleConnector
1+ import org.gradle.testkit.runner.GradleRunner
22import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SERVICE_FILTER
33import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SKIP_TAGS
4- import java.io.ByteArrayOutputStream
54import java.io.File
65import kotlin.test.*
76
@@ -42,23 +41,11 @@ class SmokeTestE2ETest {
4241
4342private fun runSmokeTests (envVars : Map <String , String > = emptyMap()): String {
4443 val sdkRootDir = System .getProperty(" user.dir" ) + " /../../../"
45- val outputStream = ByteArrayOutputStream ()
46- val connector = GradleConnector .newConnector()
47- .forProjectDirectory(File (sdkRootDir))
48- .connect()
44+ val runner = GradleRunner .create()
45+ .withProjectDir(File (sdkRootDir))
46+ .withArguments(" smokeTest" )
47+ .withEnvironment(envVars)
48+ .build()
4949
50- try {
51- connector.use {
52- it.newBuild()
53- .forTasks(" smokeTest" )
54- .setStandardOutput(outputStream)
55- .setStandardError(outputStream)
56- .setEnvironmentVariables(envVars)
57- .run ()
58- }
59- } catch (e: Exception ) {
60- throw Exception (e.message + " \n\n\n\n\n " + outputStream.toString(), e)
61- }
62-
63- return outputStream.toString()
50+ return runner.output
6451}
You can’t perform that action at this time.
0 commit comments