Clean up modules; add new modules for streaming external projects

apache · Jun 19, 2015 · a86a953 · a86a953
1 parent e46539f
commit a86a953
Showing 1 changed file with 93 additions and 13 deletions.
diff --git a/dev/run-tests.py b/dev/run-tests.py
@@ -75,8 +75,6 @@ def contains_file(self, filename):
     source_file_regexes=[
         "sql/(?!hive-thriftserver)",
         "bin/spark-sql",
-        "examples/src/main/java/org/apache/spark/examples/sql/",
-        "examples/src/main/scala/org/apache/spark/examples/sql/",
     ],
     sbt_test_goals=[
         "catalyst/test",
@@ -114,35 +112,108 @@ def contains_file(self, filename):
     name="streaming",
     dependencies=[],
     source_file_regexes=[
-        "external/",
-        "extras/java8-tests/",
-        "extras/kinesis-asl/",
         "streaming",
     ],
     sbt_test_goals=[
         "streaming/test",
-        "streaming-flume/test",
-        "streaming-flume-sink/test",
-        "streaming-kafka/test",
-        "streaming-mqtt/test",
-        "streaming-twitter/test",
+    ]
+)
+
+
+streaming_kinesis_asl = Module(
+    name="kinesis-asl",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "extras/kinesis-asl/",
+    ],
+    sbt_test_goals=[
+        "kinesis-asl/test",
+    ]
+)
+
+
+streaming_zeromq = Module(
+    name="streaming-zeromq",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/zeromq",
+    ],
+    sbt_test_goals=[
         "streaming-zeromq/test",
     ]
 )
 
 
+streaming_twitter = Module(
+    name="streaming-twitter",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/twitter",
+    ],
+    sbt_test_goals=[
+        "streaming-twitter/test",
+    ]
+)
+
+
+streaming_mqqt = Module(
+    name="streaming-mqqt",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/mqqt",
+    ],
+    sbt_test_goals=[
+        "streaming-mqqt/test",
+    ]
+)
+
+
+streaming_kafka = Module(
+    name="streaming-kafka",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/kafka",
+        "external/kafka-assembly",
+    ],
+    sbt_test_goals=[
+        "streaming-kafka/test",
+    ]
+)
+
+
+streaming_flume_sink = Module(
+    name="streaming-flume-sink",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/flume-sink",
+    ],
+    sbt_test_goals=[
+        "streaming-flume-sink/test",
+    ]
+)
+
+
+streaming_flume = Module(
+    name="streaming_flume",
+    dependencies=[streaming],
+    source_file_regexes=[
+        "external/flume",
+    ],
+    sbt_test_goals=[
+        "streaming-flume/test",
+    ]
+)
+
+
 mllib = Module(
     name="mllib",
     dependencies=[streaming, sql],
     source_file_regexes=[
-        "examples/src/main/java/org/apache/spark/examples/mllib/",
-        "examples/src/main/scala/org/apache/spark/examples/mllib",
         "data/mllib/",
         "mllib/",
     ],
     sbt_test_goals=[
         "mllib/test",
-        "examples/test",
     ]
 )
 
@@ -188,6 +259,15 @@ def contains_file(self, filename):
 )
 
 
+ec2 = Module(
+    name="ec2",
+    dependencies=[],
+    source_file_regexes=[
+        "ec2/",
+    ]
+)
+
+
 def determine_modules_for_files(filenames):
     """
     Given a list of filenames, return the set of modules that contain those files.