generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-05-02 07:31:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix PATH for RunTestExecutable

Browse Source
This commit is contained in:
Francis ANDRE 2018-10-03 19:42:00 +02:00
parent 302d5b741f
commit 4cd077101b
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Foundation/testsuite/build.gradle
View File

@ -62,6 +62,12 @@ model {
testSuites { testSuites {
FoundationTestSuite(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteSpec) { FoundationTestSuite(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteSpec) {
testing $.components.TestSuite testing $.components.TestSuite
binaries.all {
println "Task ${tasks.run.name} is associated with platform ${targetPlatform.name}"
String PATH = System.getenv("PATH")
String testAppDir = project.buildDir
println "FoundationTestSuite:testAppDir=" + testAppDir
}
} }
} }
binaries { binaries {
@ -94,23 +100,23 @@ tasks.withType(RunTestExecutable) {
if (name.contains('Win32')) { if (name.contains('Win32')) {
testAppDir += "/exe" + "/testApp" testAppDir += "/exe" + "/testApp"
PATH = "$rootDir\\bin;$PATH" PATH = "$rootDir/bin;$PATH"
PATH = "$rootDir\\openssl\\build\\win32\\bin\\release;$PATH" PATH = "$rootDir/openssl/build/win32/bin/release;$PATH"
PATH = "$rootDir\\openssl\\build\\win32\\bin\\debug;$PATH" PATH = "$rootDir/openssl/build/win32/bin/debug;$PATH"
PATH = "$mysql32Home".replace('/','\\') + "\\bin;$PATH" PATH = "$mysql32Home" + "/bin;$PATH"
PATH = "$postgres32Home".replace('/','\\') + "\\bin;$PATH" PATH = "$postgres32Home" + "/bin;$PATH"
testAppDir += "\\win32" testAppDir += "/win32"
} else } else
if (name.contains('Win64')) { if (name.contains('Win64')) {
testAppDir += "\\exe" + "\\testApp" testAppDir += "/exe" + "/testApp"
PATH = "$rootDir\\bin64;$PATH" PATH = "$rootDir/bin64;$PATH"
PATH = "$rootDir\\openssl\\build\\win64\\bin\\release;$PATH" PATH = "$rootDir/openssl/build/win64/bin/release;$PATH"
PATH = "$rootDir\\openssl\\build\\win64\\bin\\debug;$PATH" PATH = "$rootDir/openssl/build/win64/bin/debug;$PATH"
PATH = "$mysql64Home".replace('/','\\') + "\\bin;$PATH" PATH = "$mysql64Home" + "/bin;$PATH"
PATH = "$postgres64Home".replace('/','\\') + "\\bin;$PATH" PATH = "$postgres64Home" + "/bin;$PATH"
testAppDir += "\\win64" testAppDir += "/win64"
} else } else
if (name.contains('Linux32')) { if (name.contains('Linux32')) {
testAppDir += "/exe" + "/testApp" testAppDir += "/exe" + "/testApp"
@ -132,9 +138,12 @@ tasks.withType(RunTestExecutable) {
if (name.contains("Release")) if (name.contains("Release"))
testAppDir += "/release" testAppDir += "/release"
if (name.contains('Win'))
testAppDir = testAppDir.replace('/', '\\')
println "testAppDir=" + testAppDir println "testAppDir=" + testAppDir
PATH = testAppDir + ":$PATH" PATH = testAppDir + File.pathSeparator + "$PATH"
environment "Path", "$PATH" environment "Path", "$PATH"
environment "POCO_BASE", "$rootDir" environment "POCO_BASE", "$rootDir"