From 8cb3629bc480cb6b03f244e687c68043a50b6824 Mon Sep 17 00:00:00 2001 From: stepan <stepan.sindelar@oracle.com> Date: Mon, 17 Oct 2016 12:14:02 +0200 Subject: [PATCH] Task 'testing without specials' added to mx gate & ci.hocon --- ci.hocon | 7 +++++++ mx.fastr/mx_fastr.py | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ci.hocon b/ci.hocon index d96fd01f50..a45929a1f8 100644 --- a/ci.hocon +++ b/ci.hocon @@ -86,6 +86,12 @@ gateTestCommon : ${common} { gateTestLinux : ${gateTestCommon} { } +gateTestNoSpecialsLinux : ${common} { + run : [ + ${gateCmd} ["Versions,JDKReleaseInfo,BuildJavaWithJavac,UnitTests: no specials"] + ] +} + darwinEnvironment : { environment : { PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH" @@ -130,6 +136,7 @@ rbcheck : ${common} { builds = [ ${gateTestLinux} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-test-linux-amd64"} + ${gateTestNoSpecialsLinux} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-test-linux-amd64-nospecials"} ${gateTestDarwin} {capabilities : [darwin, amd64], targets : [gate, post-merge], name: "gate-test-darwin-amd64"} ${gateStyle} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-style-linux-amd64"} ${rbcheck} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-rbcheck-linux-amd64"} diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py index 7f3f3394cc..6964eff8d8 100644 --- a/mx.fastr/mx_fastr.py +++ b/mx.fastr/mx_fastr.py @@ -252,6 +252,11 @@ def _fastr_gate_runner(args, tasks): if junit(['--tests', _gate_noapps_unit_tests(), '--check-expected-output']) != 0: t.abort('unit tests expected output check failed') + with mx_gate.Task('UnitTests: no specials', tasks) as t: + if t: + if junit(['--J', '@-DR:-UseSpecials', '--tests', _gate_noapps_unit_tests()]) != 0: + t.abort('unit tests failed') + with mx_gate.Task('UnitTests', tasks) as t: if t: if junit(['--tests', _gate_noapps_unit_tests()]) != 0: -- GitLab