| 1 |
commit: 15112014e7605d13624297d7601504b5d187a6de |
| 2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
| 3 |
AuthorDate: Tue Jun 19 01:13:38 2018 +0000 |
| 4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 4 21:33:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15112014 |
| 7 |
|
| 8 |
net-irc/znc: enable integration testing |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/8901 |
| 11 |
|
| 12 |
net-irc/znc/Manifest | 2 +- |
| 13 |
net-irc/znc/files/znc-1.7.0-inttest-dir.patch | 55 ++++++++++++++++++++++ |
| 14 |
.../files/znc-1.7.0-inttest-fix-make-warning.patch | 26 ++++++++++ |
| 15 |
net-irc/znc/znc-1.7.0.ebuild | 38 +++++++++++++-- |
| 16 |
net-irc/znc/znc-9999.ebuild | 37 +++++++++++++-- |
| 17 |
5 files changed, 149 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest |
| 20 |
index 6949365add4..c68a275dfe4 100644 |
| 21 |
--- a/net-irc/znc/Manifest |
| 22 |
+++ b/net-irc/znc/Manifest |
| 23 |
@@ -1,5 +1,5 @@ |
| 24 |
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc |
| 25 |
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d |
| 26 |
+DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600 |
| 27 |
DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 |
| 28 |
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 |
| 29 |
DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b |
| 30 |
|
| 31 |
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..250eccc53fb |
| 34 |
--- /dev/null |
| 35 |
+++ b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch |
| 36 |
@@ -0,0 +1,55 @@ |
| 37 |
+diff --git a/include/znc/znc.h b/include/znc/znc.h |
| 38 |
+index ecb2b41a..a791a648 100644 |
| 39 |
+--- a/include/znc/znc.h |
| 40 |
++++ b/include/znc/znc.h |
| 41 |
+@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin { |
| 42 |
+ void DisableConfigTimer(); |
| 43 |
+ |
| 44 |
+ static void DumpConfig(const CConfig* Config); |
| 45 |
++ static CString UnusualRoot(); |
| 46 |
+ |
| 47 |
+ private: |
| 48 |
+ static CString FormatBindError(); |
| 49 |
+diff --git a/src/Modules.cpp b/src/Modules.cpp |
| 50 |
+index 5aec7805..6f9c34ae 100644 |
| 51 |
+--- a/src/Modules.cpp |
| 52 |
++++ b/src/Modules.cpp |
| 53 |
+@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() { |
| 54 |
+ sDir = CZNC::Get().GetModPath() + "/"; |
| 55 |
+ ret.push(std::make_pair(sDir, sDir)); |
| 56 |
+ |
| 57 |
++ CString sUnusualRoot = CZNC::UnusualRoot(); |
| 58 |
+ // <moduledir> and <datadir> (<prefix>/lib/znc) |
| 59 |
+- ret.push(std::make_pair(_MODDIR_ + CString("/"), |
| 60 |
+- _DATADIR_ + CString("/modules/"))); |
| 61 |
++ ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"), |
| 62 |
++ sUnusualRoot + _DATADIR_ + CString("/modules/"))); |
| 63 |
+ |
| 64 |
+ return ret; |
| 65 |
+ } |
| 66 |
+diff --git a/src/WebModules.cpp b/src/WebModules.cpp |
| 67 |
+index 19ece50a..8ea4d9fa 100644 |
| 68 |
+--- a/src/WebModules.cpp |
| 69 |
++++ b/src/WebModules.cpp |
| 70 |
+@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) { |
| 71 |
+ sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName; |
| 72 |
+ |
| 73 |
+ if (!CFile::IsDir(sRet)) { |
| 74 |
+- sRet = CString(_SKINDIR_) + "/" + sSkinName; |
| 75 |
++ sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName; |
| 76 |
+ } |
| 77 |
+ } |
| 78 |
+ |
| 79 |
+diff --git a/src/znc.cpp b/src/znc.cpp |
| 80 |
+index 4e7216ee..dd901497 100644 |
| 81 |
+--- a/src/znc.cpp |
| 82 |
++++ b/src/znc.cpp |
| 83 |
+@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() { |
| 84 |
+ m_pConfigTimer = nullptr; |
| 85 |
+ } |
| 86 |
+ } |
| 87 |
++ |
| 88 |
++CString CZNC::UnusualRoot() { |
| 89 |
++ char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT"); |
| 90 |
++ return szUnusualRoot ? szUnusualRoot : ""; |
| 91 |
++} |
| 92 |
|
| 93 |
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch |
| 94 |
new file mode 100644 |
| 95 |
index 00000000000..0be20e4c08d |
| 96 |
--- /dev/null |
| 97 |
+++ b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch |
| 98 |
@@ -0,0 +1,26 @@ |
| 99 |
+From abee9f9bfc8c9ca9d4616238fdd812c4200b17d5 Mon Sep 17 00:00:00 2001 |
| 100 |
+From: Alexey Sokolov <alexey+znc@××××××××.org> |
| 101 |
+Date: Thu, 28 Jun 2018 23:57:29 +0100 |
| 102 |
+Subject: [PATCH] Fix a warning in integration test / gmake / znc-buildmod |
| 103 |
+ interaction. |
| 104 |
+ |
| 105 |
+It was requested on https://github.com/gentoo/gentoo/pull/8901 |
| 106 |
+--- |
| 107 |
+ test/CMakeLists.txt | 5 +++++ |
| 108 |
+ 1 file changed, 5 insertions(+) |
| 109 |
+ |
| 110 |
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
| 111 |
+index b19c22fab..296cb0de7 100644 |
| 112 |
+--- a/test/CMakeLists.txt |
| 113 |
++++ b/test/CMakeLists.txt |
| 114 |
+@@ -85,5 +85,10 @@ externalproject_add(inttest_bin |
| 115 |
+ "-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}" |
| 116 |
+ "-DQt5_HINTS:path=${brew_qt5}") |
| 117 |
+ add_custom_target(inttest COMMAND |
| 118 |
++ # Prevent a warning from test of znc-buildmod, when inner make |
| 119 |
++ # discovers that there is an outer make and tries to use it: |
| 120 |
++ # gmake[4]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. |
| 121 |
++ # This option doesn't affect ninja, which doesn't show that warning anyway. |
| 122 |
++ ${CMAKE_COMMAND} -E env MAKEFLAGS= |
| 123 |
+ "${CMAKE_CURRENT_BINARY_DIR}/integration/inttest") |
| 124 |
+ add_dependencies(inttest inttest_bin) |
| 125 |
|
| 126 |
diff --git a/net-irc/znc/znc-1.7.0.ebuild b/net-irc/znc/znc-1.7.0.ebuild |
| 127 |
index b27016716af..7cd8c886597 100644 |
| 128 |
--- a/net-irc/znc/znc-1.7.0.ebuild |
| 129 |
+++ b/net-irc/znc/znc-1.7.0.ebuild |
| 130 |
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} ) |
| 131 |
|
| 132 |
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user |
| 133 |
|
| 134 |
-GTEST_VER="1.8.0" |
| 135 |
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
| 136 |
+GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet |
| 137 |
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
| 138 |
DESCRIPTION="An advanced IRC Bouncer" |
| 139 |
|
| 140 |
if [[ ${PV} == *9999* ]]; then |
| 141 |
@@ -49,8 +49,14 @@ DEPEND=" |
| 142 |
nls? ( sys-devel/gettext ) |
| 143 |
perl? ( >=dev-lang/swig-3.0.0 ) |
| 144 |
python? ( >=dev-lang/swig-3.0.0 ) |
| 145 |
+ test? ( dev-qt/qtnetwork:5 ) |
| 146 |
" |
| 147 |
|
| 148 |
+PATCHES=( |
| 149 |
+ "${FILESDIR}"/${PN}-1.7.0-inttest-fix-make-warning.patch |
| 150 |
+ "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch |
| 151 |
+) |
| 152 |
+ |
| 153 |
pkg_setup() { |
| 154 |
if use python; then |
| 155 |
python-single-r1_pkg_setup |
| 156 |
@@ -71,6 +77,9 @@ src_prepare() { |
| 157 |
rm modules/modpython/generated.tar.gz || die |
| 158 |
fi |
| 159 |
|
| 160 |
+ sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ |
| 161 |
+ test/CMakeLists.txt || die |
| 162 |
+ |
| 163 |
cmake-utils_src_prepare |
| 164 |
} |
| 165 |
|
| 166 |
@@ -90,8 +99,8 @@ src_configure() { |
| 167 |
) |
| 168 |
|
| 169 |
if [[ ${PV} != *9999* ]] && use test; then |
| 170 |
- export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" |
| 171 |
- export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" |
| 172 |
+ export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" |
| 173 |
+ export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" |
| 174 |
fi |
| 175 |
|
| 176 |
cmake-utils_src_configure |
| 177 |
@@ -99,6 +108,27 @@ src_configure() { |
| 178 |
|
| 179 |
src_test() { |
| 180 |
cmake-utils_src_make unittest |
| 181 |
+ if has network-sandbox ${FEATURES}; then |
| 182 |
+ cmake-utils_src_make install DESTDIR="${T}/inttest" |
| 183 |
+ local filter='-' |
| 184 |
+ if ! use perl; then |
| 185 |
+ filter="${filter}:ZNCTest.Modperl*" |
| 186 |
+ fi |
| 187 |
+ if ! use python; then |
| 188 |
+ filter="${filter}:ZNCTest.Modpython*" |
| 189 |
+ fi |
| 190 |
+ # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod |
| 191 |
+ # invocations from inside the test |
| 192 |
+ GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ |
| 193 |
+ CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ |
| 194 |
+ CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ |
| 195 |
+ cmake-utils_src_make inttest |
| 196 |
+ else |
| 197 |
+ # TODO: don't require sandbox after |
| 198 |
+ # https://github.com/znc/znc/pull/1363 is implemented |
| 199 |
+ ewarn "FEATURES=-network-sandbox; skipping integration tests which" |
| 200 |
+ ewarn "temporary open local ports." |
| 201 |
+ fi |
| 202 |
} |
| 203 |
|
| 204 |
src_install() { |
| 205 |
|
| 206 |
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild |
| 207 |
index b27016716af..ec9c6196f37 100644 |
| 208 |
--- a/net-irc/znc/znc-9999.ebuild |
| 209 |
+++ b/net-irc/znc/znc-9999.ebuild |
| 210 |
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} ) |
| 211 |
|
| 212 |
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user |
| 213 |
|
| 214 |
-GTEST_VER="1.8.0" |
| 215 |
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
| 216 |
+GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet |
| 217 |
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
| 218 |
DESCRIPTION="An advanced IRC Bouncer" |
| 219 |
|
| 220 |
if [[ ${PV} == *9999* ]]; then |
| 221 |
@@ -49,8 +49,13 @@ DEPEND=" |
| 222 |
nls? ( sys-devel/gettext ) |
| 223 |
perl? ( >=dev-lang/swig-3.0.0 ) |
| 224 |
python? ( >=dev-lang/swig-3.0.0 ) |
| 225 |
+ test? ( dev-qt/qtnetwork:5 ) |
| 226 |
" |
| 227 |
|
| 228 |
+PATCHES=( |
| 229 |
+ "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch |
| 230 |
+) |
| 231 |
+ |
| 232 |
pkg_setup() { |
| 233 |
if use python; then |
| 234 |
python-single-r1_pkg_setup |
| 235 |
@@ -71,6 +76,9 @@ src_prepare() { |
| 236 |
rm modules/modpython/generated.tar.gz || die |
| 237 |
fi |
| 238 |
|
| 239 |
+ sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ |
| 240 |
+ test/CMakeLists.txt || die |
| 241 |
+ |
| 242 |
cmake-utils_src_prepare |
| 243 |
} |
| 244 |
|
| 245 |
@@ -90,8 +98,8 @@ src_configure() { |
| 246 |
) |
| 247 |
|
| 248 |
if [[ ${PV} != *9999* ]] && use test; then |
| 249 |
- export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" |
| 250 |
- export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" |
| 251 |
+ export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" |
| 252 |
+ export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" |
| 253 |
fi |
| 254 |
|
| 255 |
cmake-utils_src_configure |
| 256 |
@@ -99,6 +107,27 @@ src_configure() { |
| 257 |
|
| 258 |
src_test() { |
| 259 |
cmake-utils_src_make unittest |
| 260 |
+ if has network-sandbox ${FEATURES}; then |
| 261 |
+ cmake-utils_src_make install DESTDIR="${T}/inttest" |
| 262 |
+ local filter='-' |
| 263 |
+ if ! use perl; then |
| 264 |
+ filter="${filter}:ZNCTest.Modperl*" |
| 265 |
+ fi |
| 266 |
+ if ! use python; then |
| 267 |
+ filter="${filter}:ZNCTest.Modpython*" |
| 268 |
+ fi |
| 269 |
+ # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod |
| 270 |
+ # invocations from inside the test |
| 271 |
+ GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ |
| 272 |
+ CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ |
| 273 |
+ CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ |
| 274 |
+ cmake-utils_src_make inttest |
| 275 |
+ else |
| 276 |
+ # TODO: don't require sandbox after |
| 277 |
+ # https://github.com/znc/znc/pull/1363 is implemented |
| 278 |
+ ewarn "FEATURES=-network-sandbox; skipping integration tests which" |
| 279 |
+ ewarn "temporary open local ports." |
| 280 |
+ fi |
| 281 |
} |
| 282 |
|
| 283 |
src_install() { |
Archives