1 |
On Sat, 2020-02-15 at 21:18 +0900, Naohiro Aota wrote: |
2 |
> Fold common test code from runy-gnome2 ebuild to this eclass. |
3 |
> |
4 |
> To support test under virtx, introduce RUBY_GNOME2_NEED_VIRTX variable. |
5 |
> |
6 |
> Signed-off-by: Naohiro Aota <naota@g.o> |
7 |
> --- |
8 |
> eclass/ruby-ng-gnome2.eclass | 22 ++++++++++++++++++++++ |
9 |
> 1 file changed, 22 insertions(+) |
10 |
> |
11 |
> diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass |
12 |
> index dc48a53c58cd..1cc3cdce4ce6 100644 |
13 |
> --- a/eclass/ruby-ng-gnome2.eclass |
14 |
> +++ b/eclass/ruby-ng-gnome2.eclass |
15 |
> @@ -24,7 +24,16 @@ RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN#ruby-}}" |
16 |
> RUBY_FAKEGEM_TASK_TEST="" |
17 |
> RUBY_FAKEGEM_TASK_DOC="" |
18 |
> |
19 |
> +# @ECLASS-VARIABLE: RUBY_GNOME2_NEED_VIRTX |
20 |
|
21 |
@PRE_INHERIT |
22 |
|
23 |
> +# @DESCRIPTION: |
24 |
> +# If set to 'yes', the test is run with virtx. Set before inheriting this |
25 |
> +# eclass. |
26 |
> +: ${RUBY_GNOME2_NEED_VIRTX:="no"} |
27 |
> + |
28 |
> inherit ruby-fakegem multilib versionator |
29 |
> +if [[ ${RUBY_GNOME2_NEED_VIRTX} == yes ]]; then |
30 |
> + inherit virtualx |
31 |
> +fi |
32 |
> |
33 |
> IUSE="" |
34 |
> |
35 |
> @@ -88,3 +97,16 @@ all_ruby_install() { |
36 |
> |
37 |
> all_fakegem_install |
38 |
> } |
39 |
> + |
40 |
> +# @FUNCTION: each_ruby_test |
41 |
> +# @DESCRIPTION: |
42 |
> +# Run the tests for this package. |
43 |
> +each_ruby_test() { |
44 |
> + test -e test/run-test.rb || return |
45 |
|
46 |
Don't use test in bash, use [[. |
47 |
|
48 |
> + |
49 |
> + if [[ ${RUBY_GNOME2_NEED_VIRTX} == yes ]]; then |
50 |
> + virtx ${RUBY} test/run-test.rb || die |
51 |
|
52 |
Doesn't virtx die for you? |
53 |
|
54 |
> + else |
55 |
> + ${RUBY} test/run-test.rb || die |
56 |
> + fi |
57 |
> +} |
58 |
|
59 |
-- |
60 |
Best regards, |
61 |
Michał Górny |