From 6984d17aa73cea603fd2525b3518dd0cdd88a884 Mon Sep 17 00:00:00 2001
From: Xiaohui Chen <xiaohuic@google.com>
Date: Wed, 19 Aug 2015 11:31:20 -0700
Subject: [PATCH] intellij-gen: Fix test source dir tag.

Change-Id: Iba8ab25f27f72088088b06ea180bc3b8e912e5c9
---
 tools/idegen/src/com/android/idegen/Module.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/idegen/src/com/android/idegen/Module.java b/tools/idegen/src/com/android/idegen/Module.java
index 4695ca3f6..73ed57382 100644
--- a/tools/idegen/src/com/android/idegen/Module.java
+++ b/tools/idegen/src/com/android/idegen/Module.java
@@ -234,7 +234,8 @@ public class Module {
         for (File src : srcDirs) {
             String relative = src.getCanonicalPath().substring(moduleDir.length());
             boolean isTestSource = false;
-            if (relative.startsWith("/test")) {
+            // This covers directories like .../test[s]/...
+            if (relative.matches(".*/tests?/.*")) {
                 isTestSource = true;
             }
             sourceDirectories.append("      <sourceFolder url=\"file://$MODULE_DIR$")