summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2021-03-21 13:36:53 +0100
committerJoonas Niilola <juippis@gentoo.org>2021-03-23 10:34:16 +0200
commit1ab5a53caded819f353e9967f460fe2e90e59fb8 (patch)
tree058ba723521832616b5a5757aee8f0ae2f24a66d /dev-cpp
parentapp-arch/gzip: EAPI 7 (diff)
downloadgentoo-1ab5a53caded819f353e9967f460fe2e90e59fb8.tar.gz
gentoo-1ab5a53caded819f353e9967f460fe2e90e59fb8.tar.bz2
gentoo-1ab5a53caded819f353e9967f460fe2e90e59fb8.zip
dev-cpp/prometheus-cpp: remove unused patch(es)
Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20030 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch b/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
deleted file mode 100644
index ced0b80e83e9..000000000000
--- a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From bf6e2ce56abe2a710181f0365a21ca2dafd2a8f5 Mon Sep 17 00:00:00 2001
-From: Gregor Jasny <gjasny@googlemail.com>
-Date: Fri, 13 Mar 2020 13:16:56 +0100
-Subject: [PATCH] core: Skip serialization test if locale is not available
-
-Closes: #345
----
- core/tests/raii_locale.h | 15 +++++++++++++++
- core/tests/serializer_test.cc | 21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 7 deletions(-)
- create mode 100644 core/tests/raii_locale.h
-
-diff --git a/core/tests/raii_locale.h b/core/tests/raii_locale.h
-new file mode 100644
-index 0000000..592d74f
---- /dev/null
-+++ b/core/tests/raii_locale.h
-@@ -0,0 +1,15 @@
-+#pragma once
-+
-+#include <locale>
-+
-+class RAIILocale {
-+ public:
-+ RAIILocale(const char* name) : savedLocale_(std::locale::classic()) {
-+ std::locale::global(std::locale(name));
-+ }
-+
-+ ~RAIILocale() { std::locale::global(savedLocale_); }
-+
-+ private:
-+ const std::locale savedLocale_;
-+};
-diff --git a/core/tests/serializer_test.cc b/core/tests/serializer_test.cc
-index f935a3b..6cb8f0e 100644
---- a/core/tests/serializer_test.cc
-+++ b/core/tests/serializer_test.cc
-@@ -1,9 +1,13 @@
- #include "prometheus/counter.h"
-+#include "prometheus/detail/future_std.h"
- #include "prometheus/family.h"
- #include "prometheus/text_serializer.h"
-
-+#include "raii_locale.h"
-+
- #include <gmock/gmock.h>
--#include <locale>
-+
-+#include <memory>
- #include <sstream>
-
- namespace prometheus {
-@@ -25,15 +29,18 @@ class SerializerTest : public testing::Test {
-
- #ifndef _WIN32
- TEST_F(SerializerTest, shouldSerializeLocaleIndependent) {
-- // save and change locale
-- const std::locale oldLocale = std::locale::classic();
-- std::locale::global(std::locale("de_DE.UTF-8"));
-+ std::unique_ptr<RAIILocale> localeWithCommaDecimalSeparator;
-+
-+ // ignore missing locale and skip test if setup fails
-+ try {
-+ localeWithCommaDecimalSeparator =
-+ detail::make_unique<RAIILocale>("de_DE.UTF-8");
-+ } catch (std::runtime_error&) {
-+ GTEST_SKIP();
-+ }
-
- const auto serialized = textSerializer.Serialize(collected);
- EXPECT_THAT(serialized, testing::HasSubstr("1.0"));
--
-- // restore locale
-- std::locale::global(oldLocale);
- }
- #endif
-
---
-2.28.0
-