diff --git a/build.gradle b/build.gradle index 750498cfa..8429ef089 100644 --- a/build.gradle +++ b/build.gradle @@ -769,26 +769,6 @@ subprojects { } } tasks.withType(RunTestExecutable) { - String PATH = System.getenv("PATH") - String name = getName(); - if (name.contains('Win32')) { - PATH = "$rootDir\\bin;$PATH" - PATH = "$rootDir\\openssl\\build\\win32\\bin\\release;$PATH" - PATH = "$rootDir\\openssl\\build\\win32\\bin\\debug;$PATH" - PATH = "$mysql32Home".replace('/','\\') + "\\bin;$PATH" - PATH = "$postgres32Home".replace('/','\\') + "\\bin;$PATH" - - } else - if (name.contains('Win64')) { - PATH = "$rootDir\\bin64;$PATH" - PATH = "$rootDir\\openssl\\build\\win64\\bin\\release;$PATH" - PATH = "$rootDir\\openssl\\build\\win64\\bin\\debug;$PATH" - PATH = "$mysql64Home".replace('/','\\') + "\\bin;$PATH" - PATH = "$postgres64Home".replace('/','\\') + "\\bin;$PATH" - } - - environment "Path", "$PATH" - String CPPUNIT_IGNORE = ""; if (name.contains('Win32') || name.contains('Win64')) { CPPUNIT_IGNORE = 'class CppUnit::TestCaller.testTimeSync'; @@ -823,14 +803,6 @@ subprojects { CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI9TimerTestEE.testTimer'; - //FIXME Those tests below should work - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testLaunch'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testLaunchArgs'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testIsRunning'; - CPPUNIT_IGNORE+=', N7CppUnit10TestCallerI11ProcessTestEE.testIsRunningAllowsForTermination'; } CPPUNIT_IGNORE+=' ';