Skip to content

Commit

Permalink
[Truffle] Ensure to produce some output for Travis with MSpec.
Browse files Browse the repository at this point in the history
* Remove old unused options.
  • Loading branch information
eregon committed Apr 22, 2015
1 parent db0bd4e commit 04c17ec
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 39 deletions.
26 changes: 5 additions & 21 deletions test/pom.rb
Expand Up @@ -16,31 +16,15 @@ def truffle_spec_config(spec_type, generate_report)
'<arg value="-J-Xmx1G" />' +
'<arg value="spec/mspec/bin/mspec" />' +
'<arg value="run" />' +
(generate_report ? '<arg value="-f" /><arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />' : '') +
'<arg value="-t" />' +
# Workaround for RubySpec #292
'<arg value="spec/truffle/spec-wrapper" />' +
#'<arg value="bin/jruby" />' +
#'<arg value="-T" />' +
#'<arg value="-X+T" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.not_reached=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.regex_condition=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
#'<arg value="-T" />' +
#'<arg value="-J-ea" />' +
'<arg value="--config" />' +
'<arg value="spec/truffle/truffle.mspec" />' +
'<arg value="--excl-tag" />' +
'<arg value="fails" />' +
(if generate_report
'<arg value="--format" /><arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />'
else
'<arg value="--format" /><arg value="summary" /><arg value="-V" />' # Produce some new lines for Travis+Maven
end) +
"<arg value=\":#{spec_type}\" />" +
'</exec>' +
'</target>'
Expand Down
33 changes: 15 additions & 18 deletions test/pom.xml
Expand Up @@ -687,12 +687,13 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="summary" />
<arg value="-V" />
<arg value=":language" />
</exec>
</target>
Expand Down Expand Up @@ -732,12 +733,13 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="summary" />
<arg value="-V" />
<arg value=":core" />
</exec>
</target>
Expand Down Expand Up @@ -777,12 +779,13 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="summary" />
<arg value="-V" />
<arg value=":library" />
</exec>
</target>
Expand Down Expand Up @@ -822,14 +825,12 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-f" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value=":language" />
</exec>
</target>
Expand Down Expand Up @@ -889,14 +890,12 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-f" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value=":core" />
</exec>
</target>
Expand Down Expand Up @@ -956,14 +955,12 @@
<arg value="-J-Xmx1G" />
<arg value="spec/mspec/bin/mspec" />
<arg value="run" />
<arg value="-f" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value="-t" />
<arg value="spec/truffle/spec-wrapper" />
<arg value="--config" />
<arg value="spec/truffle/truffle.mspec" />
<arg value="--excl-tag" />
<arg value="fails" />
<arg value="--format" />
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
<arg value=":library" />
</exec>
</target>
Expand Down

0 comments on commit 04c17ec

Please sign in to comment.