Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed May 9, 2015
2 parents 5de0ab0 + 289b48d commit e78948f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -152,12 +152,12 @@ class MSpecScript
]

set :tags_patterns, [
[%r(^.*/language/), 'spec/truffle/tags/language/'],
[%r(^.*/core/), 'spec/truffle/tags/core/'],
[%r(^.*/library/), 'spec/truffle/tags/library/'],
[%r(^.*/truffle/), 'spec/truffle/tags/truffle/'],
[/_spec.rb$/, '_tags.txt']
]
[%r(^.*/language/), 'spec/truffle/tags/language/'],
[%r(^.*/core/), 'spec/truffle/tags/core/'],
[%r(^.*/library/), 'spec/truffle/tags/library/'],
[%r(^.*/truffle/specs/truffle), 'spec/truffle/tags/truffle/'],
[/_spec.rb$/, '_tags.txt']
]

if windows?
# exclude specs tagged with 'windows'

0 comments on commit e78948f

Please sign in to comment.