| 1 |
The new API runs all specified arguments to virtx() inside an XFVB, |
| 2 |
instead of defining VIRTUALX_COMMAND and running that in virtualmake. |
| 3 |
|
| 4 |
Xemake and Xeconf should be replaced by "virtx emake" and "virtx econf". |
| 5 |
|
| 6 |
Signed-off-by: Justin Lecher <jlec@g.o> |
| 7 |
--- |
| 8 |
eclass/virtualx.eclass | 47 +++++++++++++++++++++++++++++++++++++---------- |
| 9 |
1 file changed, 37 insertions(+), 10 deletions(-) |
| 10 |
|
| 11 |
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass |
| 12 |
index 3df3fe1..bdecda6 100644 |
| 13 |
--- a/eclass/virtualx.eclass |
| 14 |
+++ b/eclass/virtualx.eclass |
| 15 |
@@ -89,14 +89,6 @@ esac |
| 16 |
virtualmake() { |
| 17 |
debug-print-function ${FUNCNAME} "$@" |
| 18 |
|
| 19 |
- local i=0 |
| 20 |
- local retval=0 |
| 21 |
- local OLD_SANDBOX_ON="${SANDBOX_ON}" |
| 22 |
- local XVFB XHOST XDISPLAY |
| 23 |
- local xvfbargs="-screen 0 1280x1024x24" |
| 24 |
- XVFB=$(type -p Xvfb) || die |
| 25 |
- XHOST=$(type -p xhost) || die |
| 26 |
- |
| 27 |
# backcompat for maketype |
| 28 |
if [[ -n ${maketype} ]]; then |
| 29 |
eqawarn "ebuild is exporting \$maketype=${maketype}" |
| 30 |
@@ -105,6 +97,41 @@ virtualmake() { |
| 31 |
VIRTUALX_COMMAND=${maketype} |
| 32 |
fi |
| 33 |
|
| 34 |
+ virtx "${VIRTUALX_COMMAND}" "${@}" |
| 35 |
+} |
| 36 |
+ |
| 37 |
+ |
| 38 |
+# @FUNCTION: virtx |
| 39 |
+# @USAGE: <command> [command arguments] |
| 40 |
+# @DESCRIPTION: |
| 41 |
+# Start new Xvfb session and run commands in it. |
| 42 |
+# |
| 43 |
+# Example: |
| 44 |
+# |
| 45 |
+# @CODE |
| 46 |
+# src_test() { |
| 47 |
+# virtx default |
| 48 |
+# } |
| 49 |
+# @CODE |
| 50 |
+# |
| 51 |
+# @CODE |
| 52 |
+# python_test() { |
| 53 |
+# virtx py.test --verbose |
| 54 |
+# } |
| 55 |
+# @CODE |
| 56 |
+virtx() { |
| 57 |
+ debug-print-function ${FUNCNAME} "$@" |
| 58 |
+ |
| 59 |
+ [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" |
| 60 |
+ |
| 61 |
+ local i=0 |
| 62 |
+ local retval=0 |
| 63 |
+ local OLD_SANDBOX_ON="${SANDBOX_ON}" |
| 64 |
+ local XVFB XHOST XDISPLAY |
| 65 |
+ local xvfbargs="-screen 0 1280x1024x24" |
| 66 |
+ XVFB=$(type -p Xvfb) || die |
| 67 |
+ XHOST=$(type -p xhost) || die |
| 68 |
+ |
| 69 |
debug-print "${FUNCNAME}: running Xvfb hack" |
| 70 |
export XAUTHORITY= |
| 71 |
# The following is derived from Mandrake's hack to allow |
| 72 |
@@ -154,10 +181,10 @@ virtualmake() { |
| 73 |
# to kill Xvfb |
| 74 |
debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
| 75 |
if has "${EAPI}" 2 3; then |
| 76 |
- ${VIRTUALX_COMMAND} "$@" |
| 77 |
+ "$@" |
| 78 |
retval=$? |
| 79 |
else |
| 80 |
- nonfatal ${VIRTUALX_COMMAND} "$@" |
| 81 |
+ nonfatal "$@" |
| 82 |
retval=$? |
| 83 |
fi |
| 84 |
|
| 85 |
-- |
| 86 |
2.6.3 |
Archives