Skip to content

Commit 04c17ec

Browse files
eregoneregon
committed
[Truffle] Ensure to produce some output for Travis with MSpec.
* Remove old unused options.
1 parent db0bd4e commit 04c17ec

File tree

2 files changed

+20
-39
lines changed

2 files changed

+20
-39
lines changed

‎test/pom.rb

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,15 @@ def truffle_spec_config(spec_type, generate_report)
1616
'<arg value="-J-Xmx1G" />' +
1717
'<arg value="spec/mspec/bin/mspec" />' +
1818
'<arg value="run" />' +
19-
(generate_report ? '<arg value="-f" /><arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />' : '') +
20-
'<arg value="-t" />' +
21-
# Workaround for RubySpec #292
22-
'<arg value="spec/truffle/spec-wrapper" />' +
23-
#'<arg value="bin/jruby" />' +
24-
#'<arg value="-T" />' +
25-
#'<arg value="-X+T" />' +
26-
#'<arg value="-T" />' +
27-
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
28-
#'<arg value="-T" />' +
29-
#'<arg value="-Xparser.warn.not_reached=false" />' +
30-
#'<arg value="-T" />' +
31-
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
32-
#'<arg value="-T" />' +
33-
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
34-
#'<arg value="-T" />' +
35-
#'<arg value="-Xparser.warn.regex_condition=false" />' +
36-
#'<arg value="-T" />' +
37-
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
38-
#'<arg value="-T" />' +
39-
#'<arg value="-J-ea" />' +
4019
'<arg value="--config" />' +
4120
'<arg value="spec/truffle/truffle.mspec" />' +
4221
'<arg value="--excl-tag" />' +
4322
'<arg value="fails" />' +
23+
(if generate_report
24+
'<arg value="--format" /><arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />'
25+
else
26+
'<arg value="--format" /><arg value="summary" /><arg value="-V" />' # Produce some new lines for Travis+Maven
27+
end) +
4428
"<arg value=\":#{spec_type}\" />" +
4529
'</exec>' +
4630
'</target>'

‎test/pom.xml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -687,12 +687,13 @@
687687
<arg value="-J-Xmx1G" />
688688
<arg value="spec/mspec/bin/mspec" />
689689
<arg value="run" />
690-
<arg value="-t" />
691-
<arg value="spec/truffle/spec-wrapper" />
692690
<arg value="--config" />
693691
<arg value="spec/truffle/truffle.mspec" />
694692
<arg value="--excl-tag" />
695693
<arg value="fails" />
694+
<arg value="--format" />
695+
<arg value="summary" />
696+
<arg value="-V" />
696697
<arg value=":language" />
697698
</exec>
698699
</target>
@@ -732,12 +733,13 @@
732733
<arg value="-J-Xmx1G" />
733734
<arg value="spec/mspec/bin/mspec" />
734735
<arg value="run" />
735-
<arg value="-t" />
736-
<arg value="spec/truffle/spec-wrapper" />
737736
<arg value="--config" />
738737
<arg value="spec/truffle/truffle.mspec" />
739738
<arg value="--excl-tag" />
740739
<arg value="fails" />
740+
<arg value="--format" />
741+
<arg value="summary" />
742+
<arg value="-V" />
741743
<arg value=":core" />
742744
</exec>
743745
</target>
@@ -777,12 +779,13 @@
777779
<arg value="-J-Xmx1G" />
778780
<arg value="spec/mspec/bin/mspec" />
779781
<arg value="run" />
780-
<arg value="-t" />
781-
<arg value="spec/truffle/spec-wrapper" />
782782
<arg value="--config" />
783783
<arg value="spec/truffle/truffle.mspec" />
784784
<arg value="--excl-tag" />
785785
<arg value="fails" />
786+
<arg value="--format" />
787+
<arg value="summary" />
788+
<arg value="-V" />
786789
<arg value=":library" />
787790
</exec>
788791
</target>
@@ -822,14 +825,12 @@
822825
<arg value="-J-Xmx1G" />
823826
<arg value="spec/mspec/bin/mspec" />
824827
<arg value="run" />
825-
<arg value="-f" />
826-
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
827-
<arg value="-t" />
828-
<arg value="spec/truffle/spec-wrapper" />
829828
<arg value="--config" />
830829
<arg value="spec/truffle/truffle.mspec" />
831830
<arg value="--excl-tag" />
832831
<arg value="fails" />
832+
<arg value="--format" />
833+
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
833834
<arg value=":language" />
834835
</exec>
835836
</target>
@@ -889,14 +890,12 @@
889890
<arg value="-J-Xmx1G" />
890891
<arg value="spec/mspec/bin/mspec" />
891892
<arg value="run" />
892-
<arg value="-f" />
893-
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
894-
<arg value="-t" />
895-
<arg value="spec/truffle/spec-wrapper" />
896893
<arg value="--config" />
897894
<arg value="spec/truffle/truffle.mspec" />
898895
<arg value="--excl-tag" />
899896
<arg value="fails" />
897+
<arg value="--format" />
898+
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
900899
<arg value=":core" />
901900
</exec>
902901
</target>
@@ -956,14 +955,12 @@
956955
<arg value="-J-Xmx1G" />
957956
<arg value="spec/mspec/bin/mspec" />
958957
<arg value="run" />
959-
<arg value="-f" />
960-
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
961-
<arg value="-t" />
962-
<arg value="spec/truffle/spec-wrapper" />
963958
<arg value="--config" />
964959
<arg value="spec/truffle/truffle.mspec" />
965960
<arg value="--excl-tag" />
966961
<arg value="fails" />
962+
<arg value="--format" />
963+
<arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />
967964
<arg value=":library" />
968965
</exec>
969966
</target>

0 commit comments

Comments
 (0)