Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/
Date: Wed, 13 Jun 2018 18:51:40
Message-Id: 1528915887.3fdb652c5862978d3c8b2e49b04692fb4c8fc7f1.mgorny@gentoo
1 commit: 3fdb652c5862978d3c8b2e49b04692fb4c8fc7f1
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 13 18:11:49 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 13 18:51:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdb652c
7
8 dev-util/schroot: remove unused patch
9
10 ...t-1.6.10-cmake-add-additional-regex-tests.patch | 70 ----------------------
11 1 file changed, 70 deletions(-)
12
13 diff --git a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
14 deleted file mode 100644
15 index 1660f18ae4b..00000000000
16 --- a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
17 +++ /dev/null
18 @@ -1,70 +0,0 @@
19 -From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
20 -From: Roger Leigh <rleigh@×××××××××.net>
21 -Date: Sun, 26 Jul 2015 14:00:13 +0100
22 -Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
23 - tests
24 -
25 ----
26 - cmake/regex-checks.cmake | 10 ++++++++++
27 - test/sbuild-regex.cc | 20 ++++++++++++++++++++
28 - 2 files changed, 30 insertions(+)
29 -
30 -diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
31 -index d0bb211..60507ec 100644
32 ---- a/cmake/regex-checks.cmake
33 -+++ b/cmake/regex-checks.cmake
34 -@@ -30,6 +30,16 @@ int main() {
35 - if (${namespace}_match(fail, bar)) return 11;
36 - if (${namespace}_match(fail, chk)) return 12;
37 -
38 -+ // Checks for broken support in GCC 4.9 and 5.1
39 -+ ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
40 -+ ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
41 -+ if (!${namespace}_match(test, range1)) return 13;
42 -+ if (!${namespace}_match(test, range2)) return 14;
43 -+ if (!${namespace}_match(\"a-\", range1)) return 15;
44 -+ if (!${namespace}_match(\"a-\", range2)) return 16;
45 -+ if (${namespace}_match(\"-a\", range1)) return 17;
46 -+ if (${namespace}_match(\"-a\", range2)) return 18;
47 -+
48 - return 0;
49 - }"
50 - ${outvar})
51 -diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
52 -index 915e915..a8520c5 100644
53 ---- a/test/sbuild-regex.cc
54 -+++ b/test/sbuild-regex.cc
55 -@@ -33,6 +33,8 @@ class test_regex : public TestCase
56 - CPPUNIT_TEST(test_output);
57 - CPPUNIT_TEST(test_input);
58 - CPPUNIT_TEST(test_match);
59 -+ CPPUNIT_TEST(test_match_bracket1);
60 -+ CPPUNIT_TEST(test_match_bracket2);
61 - CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
62 - CPPUNIT_TEST_SUITE_END();
63 -
64 -@@ -88,6 +90,24 @@ class test_regex : public TestCase
65 - }
66 -
67 - void
68 -+ test_match_bracket1()
69 -+ {
70 -+ sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
71 -+ CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
72 -+ CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
73 -+ CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
74 -+ }
75 -+
76 -+ void
77 -+ test_match_bracket2()
78 -+ {
79 -+ sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
80 -+ CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
81 -+ CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
82 -+ CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
83 -+ }
84 -+
85 -+ void
86 - test_input_fail()
87 - {
88 - sbuild::regex r;