commit e5ff96412c52d9696d311d9e80aeefafaf9c2e96
author Xavier Ducrohet <xav@android.com> Thu Feb 07 14:57:43 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 07 14:57:43 2013 -0800
tree 96f82c5b4c9ad79f300122de3a4945e36cd75d4e
parent bbe865d5007f84c8470247341b714a1c57ba363b
parent f306fd9ab01c82136ca5994bf0c3928ba6da5364

am f306fd9a: Merge "Ensure check dependsOn on \'test\' for flavored builds."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit 'f306fd9ab01c82136ca5994bf0c3928ba6da5364':
  Ensure check dependsOn on 'test' for flavored builds.

gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy

diff --git a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
index 2bfb775..a89c8de 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
@@ -178,6 +178,7 @@
             testTask.group = JavaBasePlugin.VERIFICATION_GROUP
             testTask.description = "Installs and runs tests for all flavors"
             testTask.reportType = ReportType.MULTI_FLAVOR
+            project.tasks.check.dependsOn testTask
 
             testTask.conventionMapping.resultsDir = {
                 String rootLocation = extension.testOptions.resultsDir != null ?