generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-24 15:26:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2512 from Kampbell/poco-1.9.1

Browse Source 
Poco 1.9.1
This commit is contained in:
Francis ANDRE 2018-10-20 01:09:47 +02:00 committed by GitHub
commit 71e8d449dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.travis.yml
View File

@ -36,21 +36,21 @@ before_script:
matrix:
include:
# - env: TEST_NAME="Gradle"
# os: osx
# compiler: clang
# script:
# - brew install mysql
# - brew install unixodbc
# - chmod 777 ./gradle/bin/gradle
# - sudo ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle build check -Ptest=-all
- env: TEST_NAME="Gradle"
os: osx
compiler: clang
script:
- brew install mysql
- brew install unixodbc
- chmod 777 ./gradle/bin/gradle
- sudo ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle build check -Ptest=-all
# - env: TEST_NAME="Gradle"
# os: linux
# compiler: gcc
# script:
# - chmod 777 ./gradle/bin/gradle
# - sudo ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle build check -Ptest=-all
- env: TEST_NAME="Gradle"
os: linux
compiler: gcc
script:
- chmod 777 ./gradle/bin/gradle
- sudo ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle build check -Ptest=-all
- env: TEST_NAME="android API level 19"
language: android

13
Foundation/testsuite/build.gradle
View File

@ -63,8 +63,12 @@ model {
FoundationTestSuite(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteSpec) {
testing $.components.TestSuite
binaries.all {
println "Task ${tasks.run.name} is associated with platform ${targetPlatform.name}"
String PATH = tasks.run.environment.get("Path")
String PATH = ""
if (targetPlatform.name.startsWith("win"))
PATH = tasks.run.environment.get("Path")
else
PATH = tasks.run.environment.get("PATH")
String testAppDir = project.buildDir
testAppDir += "/exe" + "/testApp"
@ -81,7 +85,12 @@ model {
PATH = testAppDir + File.pathSeparator + PATH
println "===" + PATH
println ""
if (targetPlatform.name.startsWith("win"))
tasks.run.environment "Path", PATH
else
tasks.run.environment "PATH", PATH
}
}
}

5
Foundation/testsuite/src/ProcessTest.cpp
View File

@ -42,7 +42,6 @@ void ProcessTest::testLaunch()
#endif
#if defined(POCO_OS_FAMILY_UNIX)
cmd = "./";
cmd += name;
#elif defined(_WIN32_WCE)
cmd = "\\";
@ -72,7 +71,6 @@ void ProcessTest::testLaunchRedirectIn()
#endif
#if defined(POCO_OS_FAMILY_UNIX)
cmd = "./";
cmd += name;
#else
cmd = name;
@ -101,7 +99,6 @@ void ProcessTest::testLaunchRedirectOut()
#endif
#if defined(POCO_OS_FAMILY_UNIX)
cmd = "./";
cmd += name;
#else
cmd = name;
@ -132,7 +129,6 @@ void ProcessTest::testLaunchEnv()
#endif
#if defined(POCO_OS_FAMILY_UNIX)
cmd = "./";
cmd += name;
#else
cmd = name;
@ -221,7 +217,6 @@ void ProcessTest::testIsRunning()
#endif
#if defined(POCO_OS_FAMILY_UNIX)
cmd = "./";
cmd += name;
#else
cmd = name;

28
build.gradle
View File

@ -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<class NTPClientTest>.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+=' ';

2
build/script/runtests.sh
View File

@ -86,7 +86,7 @@ do
echo ""
runs=`expr $runs + 1`
sh -c "cd $POCO_BUILD/$comp/testsuite/$BINDIR && LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH $TESTRUNNER $TESTRUNNERARGS"
sh -c "cd $POCO_BUILD/$comp/testsuite/$BINDIR && PATH=.:$PATH && LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH $TESTRUNNER $TESTRUNNERARGS"
if [ $? -ne 0 ] ; then
failures=`expr $failures + 1`
failedTests="$failedTests $comp"