* [gentoo-commits] repo/gentoo:master commit in: dev-erlang/hamcrest/, dev-erlang/hamcrest/files/
@ 2016-07-09 17:45 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 3+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-07-09 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 82148fb09ba83244055de38fa00fd6ed5bb0aed2
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 17:44:36 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 17:44:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82148fb0
dev-erlang/hamcrest: Restore unit tests
Apply patch from https://github.com/hyperthunk/hamcrest-erlang/pull/24
Package-Manager: portage-2.3.0
.../0.1.0_p20150103-0001-OTP-19-support.patch | 88 ++++++++++++++++++++++
.../hamcrest/hamcrest-0.1.0_p20150103.ebuild | 5 +-
2 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-OTP-19-support.patch b/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-OTP-19-support.patch
new file mode 100644
index 0000000..94e507c
--- /dev/null
+++ b/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-OTP-19-support.patch
@@ -0,0 +1,88 @@
+From 4eb8b813d0086a6eca9627ab64721378b07aa030 Mon Sep 17 00:00:00 2001
+From: Luke Bakken <lbakken@basho.com>
+Date: Sat, 9 Jul 2016 07:43:41 -0700
+Subject: [PATCH] OTP 19 support via compilation of CT suite. This defines
+ namespaced_types. Disable CT auto-compile. Fix warnings. Update to proper
+ v1.2
+
+---
+ .gitignore | 8 ++++++++
+ test.config | 16 +++++++++++++---
+ test/hamcrest_matchers_SUITE.erl | 4 ++--
+ 3 files changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 59ac5eb..d6882d0 100755
+--- a/.gitignore
++++ b/.gitignore
+@@ -4,6 +4,7 @@
+ *.o
+ *.so
+ *.swp
++.rebar/
+ build/*
+ ^build$
+ Emakefile
+@@ -15,3 +16,10 @@ ebin/*.beam
+ logs/*
+ include/hamcrest.hrl
+ qc.hrl
++deps/
++ct_*/
++all_runs.html
++ct_*
++jquery-latest.js
++jquery.tablesorter.min.js
++variables-ct@localhost
+diff --git a/test.config b/test.config
+index bff1a63..f206e37 100644
+--- a/test.config
++++ b/test.config
+@@ -1,9 +1,19 @@
+-
+ {cover_enabled, true}.
++
+ {deps, [
+- %% TODO: bind to a specific commit or tag instead of 'master'
+- {proper, ".*", {git, "http://github.com/manopapad/proper.git", "v1.1"}}
++ {proper, "1.*", {git, "http://github.com/manopapad/proper.git", "v1.2"}}
+ ]}.
+
++{erl_opts, [
++ debug_info,
++ fail_on_warning,
++ {src_dirs, ["test"]},
++ {platform_define, "^[0-9]+", namespaced_types}
++ ]}.
++
++{validate_app_modules, false}.
++
++{ct_extra_params, "-no_auto_compile"}.
++
+ {plugin_dir, "priv/build/plugins"}.
+ {plugins, [eqc_resolver]}.
+diff --git a/test/hamcrest_matchers_SUITE.erl b/test/hamcrest_matchers_SUITE.erl
+index f2889e2..6726425 100644
+--- a/test/hamcrest_matchers_SUITE.erl
++++ b/test/hamcrest_matchers_SUITE.erl
+@@ -69,7 +69,7 @@ is_not_evaluates_to_logical_negation_of_underlying_matcher(_) ->
+ ?EQC(P).
+
+ is_not_provides_convenient_shortcut_for_not_equal_to(_) ->
+- P = ?FORALL({X, Y}, {binary(), binary()},
++ P = ?FORALL({X, _Y}, {binary(), binary()},
+ begin
+ #'hamcrest.matchspec'{matcher=F1} = equal_to(X),
+ #'hamcrest.matchspec'{matcher=F2} = is_not(X),
+@@ -240,7 +240,7 @@ ends_with_should_only_match_last_portion_of_string(_) ->
+ ?IMPLIES(length(Xs) > 0,
+ begin
+ Y = round(length(Xs) / 2),
+- LStr = string:left(Xs, Y),
++ _LStr = string:left(Xs, Y),
+ RStr = string:right(Xs, Y),
+ case (assert_that(Xs, ends_with(RStr))) of
+ true -> true;
+--
+2.9.0
+
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
index 25e888d..04bd458 100644
--- a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
+++ b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
@@ -22,10 +22,7 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}"
DOCS=( NOTES README.markdown TODO.md )
-
-# FIXME: Fails, reported upstream:
-# FIXME: https://github.com/hyperthunk/hamcrest-erlang/issues/21
-RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${PV}-0001-OTP-19-support.patch )
# Override with EAPI default because it's missing hamcrest.app.src and doesn't
# have any deps.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-erlang/hamcrest/, dev-erlang/hamcrest/files/
@ 2016-07-09 18:01 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 3+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-07-09 18:01 UTC (permalink / raw
To: gentoo-commits
commit: 979165f382c76a9728c16ec4b1ac672a2799a809
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 18:01:18 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 18:01:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979165f3
dev-erlang/hamcrest: Change patch name
Package-Manager: portage-2.3.0
...01-OTP-19-support.patch => 0.1.0_p20150103-0001-Fix-unittests.patch} | 0
dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-OTP-19-support.patch b/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch
similarity index 100%
rename from dev-erlang/hamcrest/files/0.1.0_p20150103-0001-OTP-19-support.patch
rename to dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
index 04bd458..787dff1 100644
--- a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
+++ b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
@@ -22,7 +22,7 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}"
DOCS=( NOTES README.markdown TODO.md )
-PATCHES=( "${FILESDIR}"/${PV}-0001-OTP-19-support.patch )
+PATCHES=( "${FILESDIR}"/${PV}-0001-Fix-unittests.patch )
# Override with EAPI default because it's missing hamcrest.app.src and doesn't
# have any deps.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-erlang/hamcrest/, dev-erlang/hamcrest/files/
@ 2018-03-28 19:01 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-03-28 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 9166d24e338077efadafa88b6e760f0ce24a568d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 18:54:26 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 19:01:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9166d24e
dev-erlang/hamcrest: Drop old, to allow removal of vulnerable erlang
Package-Manager: Portage-2.3.26, Repoman-2.3.7
dev-erlang/hamcrest/Manifest | 1 -
.../files/0.1.0_p20150103-0001-Fix-unittests.patch | 88 ----------------------
.../hamcrest/hamcrest-0.1.0_p20150103.ebuild | 35 ---------
3 files changed, 124 deletions(-)
diff --git a/dev-erlang/hamcrest/Manifest b/dev-erlang/hamcrest/Manifest
index 73ef9536a88..cfda7768b23 100644
--- a/dev-erlang/hamcrest/Manifest
+++ b/dev-erlang/hamcrest/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-0.1.0_p20150103.tar.gz 160516 BLAKE2B 30ef36c9e1c9078cecc5077a2fc6ae35b1e4a120513f7a6f52f33207f364de1c87b6206812116aefe0c64e9480dc772154e7a2d39a36f8c1556bc957532fbf75 SHA512 d7ed0db598f15e5a2724c31d35a2e34ca55ff37d715c1e8a4b35fd438567f1ae2c4d266dee7215690e8508f77f625a551b7ecbef06582a9ffddb9d14d895fab8
DIST hamcrest-0.1.0_p20160709.tar.gz 160574 BLAKE2B e7fd8db2ea69e89ff4adb89d4c9cd87ce1557019f18200201bffb0e9f867d03ccaaa2f957f38057ed1d0b01372f1646e7233f013e08cd4fdcdd56ac631af4230 SHA512 a1d162e72019bcd56c3f1c486e65b7f788e69a1a2985e5500920565bf6c40b6dd7b920e720ffc8da81cac3b1919124b8defadec2fcef5b27585e63da3abd852e
diff --git a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch b/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch
deleted file mode 100644
index 94e507cf66c..00000000000
--- a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 4eb8b813d0086a6eca9627ab64721378b07aa030 Mon Sep 17 00:00:00 2001
-From: Luke Bakken <lbakken@basho.com>
-Date: Sat, 9 Jul 2016 07:43:41 -0700
-Subject: [PATCH] OTP 19 support via compilation of CT suite. This defines
- namespaced_types. Disable CT auto-compile. Fix warnings. Update to proper
- v1.2
-
----
- .gitignore | 8 ++++++++
- test.config | 16 +++++++++++++---
- test/hamcrest_matchers_SUITE.erl | 4 ++--
- 3 files changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 59ac5eb..d6882d0 100755
---- a/.gitignore
-+++ b/.gitignore
-@@ -4,6 +4,7 @@
- *.o
- *.so
- *.swp
-+.rebar/
- build/*
- ^build$
- Emakefile
-@@ -15,3 +16,10 @@ ebin/*.beam
- logs/*
- include/hamcrest.hrl
- qc.hrl
-+deps/
-+ct_*/
-+all_runs.html
-+ct_*
-+jquery-latest.js
-+jquery.tablesorter.min.js
-+variables-ct@localhost
-diff --git a/test.config b/test.config
-index bff1a63..f206e37 100644
---- a/test.config
-+++ b/test.config
-@@ -1,9 +1,19 @@
--
- {cover_enabled, true}.
-+
- {deps, [
-- %% TODO: bind to a specific commit or tag instead of 'master'
-- {proper, ".*", {git, "http://github.com/manopapad/proper.git", "v1.1"}}
-+ {proper, "1.*", {git, "http://github.com/manopapad/proper.git", "v1.2"}}
- ]}.
-
-+{erl_opts, [
-+ debug_info,
-+ fail_on_warning,
-+ {src_dirs, ["test"]},
-+ {platform_define, "^[0-9]+", namespaced_types}
-+ ]}.
-+
-+{validate_app_modules, false}.
-+
-+{ct_extra_params, "-no_auto_compile"}.
-+
- {plugin_dir, "priv/build/plugins"}.
- {plugins, [eqc_resolver]}.
-diff --git a/test/hamcrest_matchers_SUITE.erl b/test/hamcrest_matchers_SUITE.erl
-index f2889e2..6726425 100644
---- a/test/hamcrest_matchers_SUITE.erl
-+++ b/test/hamcrest_matchers_SUITE.erl
-@@ -69,7 +69,7 @@ is_not_evaluates_to_logical_negation_of_underlying_matcher(_) ->
- ?EQC(P).
-
- is_not_provides_convenient_shortcut_for_not_equal_to(_) ->
-- P = ?FORALL({X, Y}, {binary(), binary()},
-+ P = ?FORALL({X, _Y}, {binary(), binary()},
- begin
- #'hamcrest.matchspec'{matcher=F1} = equal_to(X),
- #'hamcrest.matchspec'{matcher=F2} = is_not(X),
-@@ -240,7 +240,7 @@ ends_with_should_only_match_last_portion_of_string(_) ->
- ?IMPLIES(length(Xs) > 0,
- begin
- Y = round(length(Xs) / 2),
-- LStr = string:left(Xs, Y),
-+ _LStr = string:left(Xs, Y),
- RStr = string:right(Xs, Y),
- case (assert_that(Xs, ends_with(RStr))) of
- true -> true;
---
-2.9.0
-
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
deleted file mode 100644
index 66f111f47de..00000000000
--- a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang port of Hamcrest"
-HOMEPAGE="https://github.com/hyperthunk/hamcrest-erlang"
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-CDEPEND=">=dev-lang/erlang-17.1
- <dev-lang/erlang-19"
-DEPEND="${CDEPEND}
- test? ( >=dev-erlang/proper-1.1 )"
-RDEPEND="${CDEPEND}"
-
-DOCS=( NOTES README.markdown TODO.md )
-PATCHES=( "${FILESDIR}"/${PV}-0001-Fix-unittests.patch )
-
-# Override with EAPI default because it's missing hamcrest.app.src and doesn't
-# have any deps.
-src_prepare() {
- default
-}
-
-src_test() {
- rebar_remove_deps test.config
- erebar -C test.config compile ct
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-28 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-09 17:45 [gentoo-commits] repo/gentoo:master commit in: dev-erlang/hamcrest/, dev-erlang/hamcrest/files/ Amadeusz Piotr Żołnowski
-- strict thread matches above, loose matches on Subject: below --
2016-07-09 18:01 Amadeusz Piotr Żołnowski
2018-03-28 19:01 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox