From f8cb6237f553f5a7cbc3a02ebd5b4d0084286396 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 27 Nov 2017 20:16:14 -0600 Subject: [PATCH] windows ci: remove rake in favor of gradle fixes #8732 Fixes #8743 --- ci/unit_tests.bat | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/ci/unit_tests.bat b/ci/unit_tests.bat index d94abf99c..44cb350bf 100644 --- a/ci/unit_tests.bat +++ b/ci/unit_tests.bat @@ -39,47 +39,9 @@ echo Using drive !use_drive! for %WORKSPACE% :: change current directory to that drive !use_drive! -:: Since we are using the system jruby, we need to make sure our jvm process -:: uses at least 1g of memory, If we don't do this we can get OOM issues when -:: installing gems. See https://github.com/elastic/logstash/issues/5179 +echo Running core tests.. +call .\gradlew.bat test --console=plain -set JRUBY_OPTS="-J-Xmx1g" -set SELECTEDTESTSUITE=%1 -set /p JRUBYVERSION=<.ruby-version - -if "%JRUBYSRCDIR%" == "" ( - echo Error: environment variable JRUBYSRCDIR must be defined. Aborting.. - exit /B 1 -) - -if not exist %JRUBYSRCDIR% ( - echo Error: variable JRUBYSRCDIR must be declared with a valid directory. Aborting.. - exit /B 1 -) - -set JRUBYPATH=%JRUBYSRCDIR%\%JRUBYVERSION% - -if not exist %JRUBYPATH% ( - echo Error: could not find JRuby in %JRUBYPATH%. Aborting.. - exit /B 1 -) - -set RAKEPATH=%JRUBYPATH%\bin\rake - -echo Installing core plugins.. -call %RAKEPATH% test:install-core -if errorlevel 1 ( - echo Error: failed to install core plugins. Aborting.. - exit /B 1 -) - -if "%SELECTEDTESTSUITE%" == "core-fail-fast" ( - echo Running core-fail-fast tests.. - call %RAKEPATH% test:core-fail-fast -) else ( - echo Running core tests.. - call %RAKEPATH% test:core -) if errorlevel 1 ( echo Error: failed to run core tests. Aborting.. exit /B 1