Skip to content

Commit bf92089

Browse files
committed
enabled running test from root gradle file
1 parent e3879a8 commit bf92089

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed

build.gradle

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -179,23 +179,24 @@ task deleteCommitFile (type: Delete) {
179179
task generateRuntime (type: Exec) {
180180
doFirst{
181181
workingDir "$rootDir/src"
182-
182+
def passParams = new LinkedList<String>()
183+
passParams.addAll(envVars);
183184
//command gradlew buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
184185
if(isWinOs) {
185-
envVars.addFirst("-PgitCommitVersion=${arVersion}");
186-
envVars.addFirst("-PpackageVersion=${pVersion}");
187-
envVars.addFirst("buildar");
188-
envVars.addFirst("gradlew");
189-
envVars.addFirst("/c");
190-
envVars.addFirst("cmd");
191-
commandLine envVars.toArray()
186+
passParams.addFirst("-PgitCommitVersion=${arVersion}");
187+
passParams.addFirst("-PpackageVersion=${pVersion}");
188+
passParams.addFirst("buildar");
189+
passParams.addFirst("gradlew");
190+
passParams.addFirst("/c");
191+
passParams.addFirst("cmd");
192+
commandLine passParams.toArray()
192193
}
193194
else {
194-
envVars.addFirst("-PgitCommitVersion=${arVersion}");
195-
envVars.addFirst("-PpackageVersion=${pVersion}");
196-
envVars.addFirst("buildar");
197-
envVars.addFirst("./gradlew");
198-
commandLine envVars.toArray();
195+
passParams.addFirst("-PgitCommitVersion=${arVersion}");
196+
passParams.addFirst("-PpackageVersion=${pVersion}");
197+
passParams.addFirst("buildar");
198+
passParams.addFirst("./gradlew");
199+
commandLine passParams.toArray();
199200
}
200201
}
201202
}
@@ -288,16 +289,23 @@ task packar {
288289
dependsOn packFramework
289290
}
290291

291-
292-
293-
294-
295-
296-
297-
298-
299-
300-
301-
302-
303-
292+
task runTest(type: Exec) {
293+
if(project.hasProperty("enableTest")) {
294+
workingDir "$rootDir/test-app"
295+
296+
def passParams = new LinkedList<String>()
297+
passParams.addAll(envVars);
298+
if(isWinOs) {
299+
passParams.addFirst("runtest");
300+
passParams.addFirst("gradle");
301+
passParams.addFirst("/c");
302+
passParams.addFirst("cmd");
303+
commandLine passParams.toArray();
304+
}
305+
else {
306+
passParams.addFirst("runtest");
307+
passParams.addFirst("./gradle");
308+
commandLine passParams.toArray();
309+
}
310+
}
311+
}

test-app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ buildscript {
2828
apply plugin: "com.android.application"
2929

3030

31-
def compiteCompileSdkVersion () {
31+
def computeCompileSdkVersion () {
3232
if(project.hasProperty("compileSdk")) {
3333
return compileSdk
3434
}
@@ -64,7 +64,7 @@ def computeSupportVersion() {
6464
}
6565

6666
android {
67-
compileSdkVersion compiteCompileSdkVersion()
67+
compileSdkVersion computeCompileSdkVersion()
6868
buildToolsVersion computeBuildToolsVersion()
6969

7070
defaultConfig {

0 commit comments

Comments
 (0)