From c645fe6766cfdbddf8feafdfa5ea6397e7b44acb Mon Sep 17 00:00:00 2001
From: Michael Muller <mmuller@google.com>
Date: Mon, 26 Aug 2019 12:31:24 -0400
Subject: [PATCH] Fix skipDockerIncompatibleTests (#240)

We have to add a check for the skipDockerIncompatibleTests property in the
fragileTest task, since that's where these tests now live.
---
 core/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index 7f7f96de5..624b2feca 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -563,6 +563,10 @@ task fragileTest(type: Test) {
   exclude "**/*TestCase.*", "**/*TestSuite.*"
   include fragileTestPatterns
 
+  if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
+    exclude dockerIncompatibleTestPatterns
+  }
+
   // Run every test class in a freshly started process.
   forkEvery 1