From d7375fe89d41fd4d0ba1c722cf07383d926cf841 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Mon, 29 Apr 2019 19:49:26 +0200 Subject: [PATCH] Rebase s390x hack patch --- 0001-s390x-A-compile-hack.patch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch index 4765989..951a487 100644 --- a/0001-s390x-A-compile-hack.patch +++ b/0001-s390x-A-compile-hack.patch @@ -1,4 +1,4 @@ -From a45270a441d483ce57db48cda699a0d2d9c01f18 Mon Sep 17 00:00:00 2001 +From 94db732128bdeec330f7353f2514940bc1abd97b Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 28 Feb 2019 00:58:12 +0100 Subject: [PATCH] s390x: A compile hack @@ -6,8 +6,8 @@ Subject: [PATCH] s390x: A compile hack Signed-off-by: Boris Ranto --- src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++ - src/test/rgw/test_rgw_dmclock_scheduler.cc | 8 ++++---- - 2 files changed, 6 insertions(+), 4 deletions(-) + src/test/rgw/test_rgw_dmclock_scheduler.cc | 7 ++++--- + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc index 18ba5a5e32..08657cf2b5 100644 @@ -30,7 +30,7 @@ index 18ba5a5e32..08657cf2b5 100644 return 0; } diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc -index 4e4177cb0b..ddbfd12217 100644 +index 7d2ef9b328..e09f727972 100644 --- a/src/test/rgw/test_rgw_dmclock_scheduler.cc +++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc @@ -14,6 +14,8 @@ @@ -42,16 +42,15 @@ index 4e4177cb0b..ddbfd12217 100644 #include "rgw/rgw_dmclock_sync_scheduler.h" #include "rgw/rgw_dmclock_async_scheduler.h" -@@ -395,8 +397,6 @@ TEST(Queue, CrossExecutorRequest) - EXPECT_EQ(PhaseType::priority, *p2); +@@ -76,7 +78,6 @@ TEST(Queue, SyncRequest) + EXPECT_EQ(0u, counters(client_id::auth)->get(queue_counters::l_cancel)); } -#ifdef HAVE_BOOST_CONTEXT -- - TEST(Queue, SpawnAsyncRequest) + TEST(Queue, RateLimit) { boost::asio::io_context context; -@@ -426,6 +426,6 @@ TEST(Queue, SpawnAsyncRequest) +@@ -426,6 +427,6 @@ TEST(Queue, SpawnAsyncRequest) EXPECT_TRUE(context.stopped()); }