From 34c2fa44092eea4edcb1da3244ed495ea229a6e1 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 25 Jan 2012 12:28:39 -0600
Subject: [PATCH] minor change to matrix plugin to allow multiple sources for
 specifying to skip "matrix unit" test task generation

---
 .../build/gradle/testing/matrix/MatrixTestingPlugin.groovy  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
index c4b9b72d61..1c774a6964 100644
--- a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
@@ -86,11 +86,15 @@ public class MatrixTestingPlugin implements Plugin<Project> {
             matrixTask.dependsOn( matrixNodeTask );
         }
 
-        if ( !System.properties[SKIP_UNIT_TEST].equals('true') ) {
+		if ( ! shouldSkipMatrixTestsAgainstDefaultDb() ) {
 			createTestTaskForMatrixSourceSet();
 		}
     }
 
+	private boolean shouldSkipMatrixTestsAgainstDefaultDb() {
+		return "true".equals( project.properties[SKIP_UNIT_TEST] ) || "true".equals( System.properties[SKIP_UNIT_TEST] );
+	}
+
 	private List<MatrixNode> locateMatrixNodes() {
         List<MatrixNode> matrixNodes = new ArrayList<MatrixNode>();
 		Iterable<DatabaseProfile> profiles = project.rootProject.plugins[DatabaseProfilePlugin].databaseProfiles;