[med-svn] [ncbi-vdb] 05/06: Adapt patches
Andreas Tille
tille at debian.org
Fri Nov 4 08:31:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ncbi-vdb.
commit 6fadcd4e0e4ab12f70ab1ac41b58c9e4fd51bfb9
Author: Andreas Tille <tille at debian.org>
Date: Fri Nov 4 08:56:24 2016 +0100
Adapt patches
---
debian/patches/skip_failing_test.patch | 43 ++++++++++++++-------------
debian/patches/use_debian_packaged_zlib.patch | 2 +-
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/debian/patches/skip_failing_test.patch b/debian/patches/skip_failing_test.patch
index 2d09abd..169769c 100644
--- a/debian/patches/skip_failing_test.patch
+++ b/debian/patches/skip_failing_test.patch
@@ -5,8 +5,8 @@ Description: Skip some tests that are failing in pbuilder.
--- a/test/kfs/cacheteetest.cpp
+++ b/test/kfs/cacheteetest.cpp
-@@ -484,7 +484,7 @@ TEST_CASE( CacheTee_Multiple_Users_Singl
-
+@@ -482,7 +482,7 @@ TEST_CASE( CacheTee_Multiple_Users_Singl
+ #if !defined(WINDOWS) && !defined(_WIN32)
TEST_CASE( CacheTee_ReadOnly )
{
- KOutMsg( "Test: CacheTee_ReadOnly\n" );
@@ -14,7 +14,7 @@ Description: Skip some tests that are failing in pbuilder.
remove_file( CACHEFILE ); // to start with a clean slate on caching...
remove_file( CACHEFILE1 );
-@@ -511,7 +511,7 @@ TEST_CASE( CacheTee_ReadOnly )
+@@ -508,7 +508,7 @@ TEST_CASE( CacheTee_ReadOnly )
/* we read all from the tee-file that should have promoted it on Release,
but we made it read only before the creation of the 2nd tee-file
because of that it should not be promoted and not complete */
@@ -23,12 +23,14 @@ Description: Skip some tests that are failing in pbuilder.
const KFile * cache;
REQUIRE_RC_FAIL( KDirectoryOpenFileRead( dir, &cache, "%s", CACHEFILE ) );
REQUIRE_RC( KDirectoryOpenFileRead( dir, &cache, "%s", CACHEFILE1 ) );
-@@ -523,11 +523,12 @@ TEST_CASE( CacheTee_ReadOnly )
+@@ -520,13 +520,13 @@ TEST_CASE( CacheTee_ReadOnly )
REQUIRE_RC( KFileRelease( cache ) );
REQUIRE_RC( KFileRelease( org ) );
REQUIRE_RC( KDirectoryRelease( dir ) );
-+*/
+-
++*/
}
+ #endif
TEST_CASE( CacheTee_Multiple_Users_with_Promoting )
{
@@ -37,7 +39,7 @@ Description: Skip some tests that are failing in pbuilder.
remove_file( CACHEFILE ); // to start with a clean slate on caching...
remove_file( CACHEFILE1 );
-@@ -543,24 +544,26 @@ TEST_CASE( CacheTee_Multiple_Users_with_
+@@ -542,24 +542,26 @@ TEST_CASE( CacheTee_Multiple_Users_with_
const KFile * tee2;
REQUIRE_RC( KDirectoryMakeCacheTee ( dir, &tee2, org, BLOCKSIZE, "%s", CACHEFILE ) );
@@ -66,8 +68,8 @@ Description: Skip some tests that are failing in pbuilder.
REQUIRE_RC( KDirectoryRelease( dir ) );
+*/
}
- #endif
+ //////////////////////////////////////////// Main
--- a/test/klib/test-klib.cpp
+++ b/test/klib/test-klib.cpp
@@ -776,7 +776,7 @@ TEST_CASE(IsUserAnAdminTest)
@@ -119,7 +121,7 @@ Description: Skip some tests that are failing in pbuilder.
//////////////////////////////////////////// Main
--- a/test/kns/knstest.cpp
+++ b/test/kns/knstest.cpp
-@@ -170,9 +170,11 @@ FIXTURE_TEST_CASE(MakeListener, KnsManag
+@@ -175,9 +175,11 @@ FIXTURE_TEST_CASE(MakeListener, KnsManag
CONST_STRING(&name, "socket");
REQUIRE_RC(KNSManagerInitIPCEndpoint(mgr, &ep, &name));
KListener* listener;
@@ -131,7 +133,7 @@ Description: Skip some tests that are failing in pbuilder.
}
FIXTURE_TEST_CASE(MakeIPCConnection_NoListener, KnsManagerFixture)
-@@ -265,9 +267,10 @@ public:
+@@ -272,9 +274,10 @@ public:
transform(ret.begin(), ret.end(), ret.begin(), ::toupper);
return ret;
}
@@ -143,7 +145,7 @@ Description: Skip some tests that are failing in pbuilder.
if (KNSManagerMakeListener ( mgr, &listener, &ep ) == 0)
{
rc_t rc = 0;
-@@ -293,8 +296,9 @@ public:
+@@ -300,8 +303,9 @@ public:
}
else
throw logic_error ( "SocketFixture: KNSMakeListener failed" );
@@ -154,7 +156,7 @@ Description: Skip some tests that are failing in pbuilder.
static rc_t DefaultWorkerThreadFn ( const KThread *self, void *data )
{
try
-@@ -376,74 +380,6 @@ public:
+@@ -386,74 +390,6 @@ public:
char buf[MaxMessageSize];
};
@@ -162,7 +164,7 @@ Description: Skip some tests that are failing in pbuilder.
-{ // client runs in a child process
- string content = GetName();
-
-- KStream* stream = MakeStream ( 50 ); /* this might make some retries while the server is setting up */
+- KStream* stream = MakeStream ( 50 * 1000 ); /* this might make some retries while the server is setting up */
- LOG(LogLevel::e_message, "client '" << GetName() << "' after KNSMakeConnection" << endl);
-
- REQUIRE_RC(KStreamWrite(stream, content.c_str(), content.length(), &num));
@@ -179,12 +181,12 @@ Description: Skip some tests that are failing in pbuilder.
-PROCESS_FIXTURE_TEST_CASE(IPCEndpoint_MultipleListeners, SocketFixture, 0, 100)
-{ // client runs in a child process
-
-- KStream* stream = MakeStream ( 50 ); /* this might make some retries while the server is setting up */
+- KStream* stream = MakeStream ( 50 * 1000 ); /* this might make some retries while the server is setting up */
- LOG(LogLevel::e_message, "client '" << GetName() << "' after KNSMakeConnection1" << endl);
-
- TestEnv::Sleep(1); // on Windows 32, when the two calls to KNSManagerMakeConnection follow too closely, sometimes things get messed up
-
-- KStream* stream2 = MakeStream ( 5 ); /* should work from the first try now*/
+- KStream* stream2 = MakeStream ( 5 * 1000 ); /* should work from the first try now*/
- LOG(LogLevel::e_message, "client '" << GetName() << "' after KNSMakeConnection2" << endl);
-
- string content = string(GetName())+"_1";
@@ -213,7 +215,7 @@ Description: Skip some tests that are failing in pbuilder.
-{ // call ReadAll requesting more bytes than available, see it return only what is available
- string content = GetName();
-
-- KStream* stream = MakeStream ( 5 );
+- KStream* stream = MakeStream ( 5 * 1000 );
- LOG(LogLevel::e_message, "client '" << GetName() << "' after KNSMakeConnection" << endl);
-
- REQUIRE_RC(KStreamWrite(stream, content.c_str(), content.length(), &num));
@@ -229,7 +231,7 @@ Description: Skip some tests that are failing in pbuilder.
//////////////////////////////////////////// IPC, timed reads
class TimedReadSocketFixture : public SocketFixture
{
-@@ -542,76 +478,6 @@ public:
+@@ -552,76 +488,6 @@ public:
timeout_t tm;
};
@@ -306,7 +308,7 @@ Description: Skip some tests that are failing in pbuilder.
////////////////////// 2. KNSManagerMakeTimedConnection, then use KStreamRead/Write, or override using TimedRead/Write,
////////////////////// or override using KNSManagerSetConnectionTimeouts
class TimedConnection_ReadSocketFixture : public TimedReadSocketFixture
-@@ -645,162 +511,6 @@ public:
+@@ -658,163 +524,6 @@ public:
}
};
@@ -381,7 +383,7 @@ Description: Skip some tests that are failing in pbuilder.
-}
-PROCESS_FIXTURE_TEST_CASE(TimedConnection_SettingsOverride_0_Timeout, TimedConnection_ReadSocketFixture, 0, 20)
-{ // 2.2.2 time out immediately when the server has not yet responded
-- REQUIRE_RC(KNSManagerSetConnectionTimeouts(mgr, 5, 0, 0)); // override default setting (long time-out) to "no wait"
+- REQUIRE_RC(KNSManagerSetConnectionTimeouts(mgr, 5000, 0, 0)); // override default setting (long time-out) to "no wait"
- string content = GetName();
- TimedReadSocketFixture::SetupClient(content);
-
@@ -466,10 +468,11 @@ Description: Skip some tests that are failing in pbuilder.
-
- TeardownClient();
-}
-
+-
//////////////////////////////////////////// IPC, timed writes
class TimedWriteSocketFixture : public SocketFixture
-@@ -993,40 +703,6 @@ public:
+ {
+@@ -1006,40 +715,6 @@ public:
volatile bool TimedWriteSocketFixture::go = false;
diff --git a/debian/patches/use_debian_packaged_zlib.patch b/debian/patches/use_debian_packaged_zlib.patch
index 48666fd..c7f8467 100644
--- a/debian/patches/use_debian_packaged_zlib.patch
+++ b/debian/patches/use_debian_packaged_zlib.patch
@@ -15,7 +15,7 @@ Description: External copy of bz2 and zlib are removed - exclude these from
kproc \
--- a/libs/ncbi-vdb/Makefile
+++ b/libs/ncbi-vdb/Makefile
-@@ -100,9 +100,7 @@ VDB_LIB_CMN = \
+@@ -103,9 +103,7 @@ VDB_LIB_CMN = \
klib \
kproc \
$(LIBKQ) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-vdb.git
More information about the debian-med-commit
mailing list