Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
ed336e0d
Commit
ed336e0d
authored
11 years ago
by
Matei Zaharia
Browse files
Options
Downloads
Patches
Plain Diff
Fix tests from different projects running in parallel in SBT 0.12
parent
7cd83bf0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
project/SparkBuild.scala
+4
-2
4 additions, 2 deletions
project/SparkBuild.scala
project/build.properties
+1
-1
1 addition, 1 deletion
project/build.properties
with
5 additions
and
3 deletions
project/SparkBuild.scala
+
4
−
2
View file @
ed336e0d
...
...
@@ -44,7 +44,10 @@ object SparkBuild extends Build {
transitiveClassifiers
in
Scope
.
GlobalScope
:=
Seq
(
"sources"
),
testListeners
<<=
target
.
map
(
t
=>
Seq
(
new
eu
.
henkelmann
.
sbt
.
JUnitXmlTestsListener
(
t
.
getAbsolutePath
))),
// shared between both core and streaming.
// Only allow one test at a time, even across projects, since they run in the same JVM
concurrentRestrictions
in
Global
+=
Tags
.
limit
(
Tags
.
Test
,
1
),
// Shared between both core and streaming.
resolvers
++=
Seq
(
"Akka Repository"
at
"http://repo.akka.io/releases/"
),
// For Sonatype publishing
...
...
@@ -98,7 +101,6 @@ object SparkBuild extends Build {
"com.novocode"
%
"junit-interface"
%
"0.9"
%
"test"
,
"org.easymock"
%
"easymock"
%
"3.1"
%
"test"
),
parallelExecution
:=
false
,
/* Workaround for issue #206 (fixed after SBT 0.11.0) */
watchTransitiveSources
<<=
Defaults
.
inDependencies
[
Task
[
Seq
[
File
]]](
watchSources
.
task
,
const
(
std
.
TaskExtra
.
constant
(
Nil
)),
aggregate
=
true
,
includeRoot
=
true
)
apply
{
_
.
join
.
map
(
_
.
flatten
)
},
...
...
This diff is collapsed.
Click to expand it.
project/build.properties
+
1
−
1
View file @
ed336e0d
sbt.version
=
0.12.
2
sbt.version
=
0.12.
3
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment