Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LSH
lsh
Commits
7cd5989d
Commit
7cd5989d
authored
Feb 16, 2009
by
Niels Möller
Browse files
(XAUTH, XMODMAP, XVFB): New variables.
(need_xvfb, spawn_xvfb): Use $XVFB. Rev: src/testsuite/functions.sh:1.56
parent
706d642f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/testsuite/functions.sh
View file @
7cd5989d
...
...
@@ -30,6 +30,10 @@ LSH_MAKE_SEED=/bin/false
:
${
LSHD_CONFIG_DIR
:
=
"
$srcdir
/config"
}
:
${
XAUTH
:
=
"
`
PATH
=
"
$PATH
:/usr/openwin/bin:/usr/X11R6/bin"
type_p xauth
`
"
}
:
${
XMODMAP
:
=
"
`
PATH
=
"
$PATH
:/usr/openwin/bin:/usr/X11R6/bin"
type_p xmodmap
`
"
}
:
${
XVFB
:
=
"
`
PATH
=
"
$PATH
:/usr/openwin/bin:/usr/X11R6/bin"
type_p Xvfb
`
"
}
export
LSH_YARROW_SEED_FILE SEXP_CONV LSH_TRANSPORT
export
LSHD_CONNECTION LSHD_PTY_HELPER LSHD_USERAUTH
export
LSHD_UTMP LSHD_WTMP LSHD_CONFIG_DIR
...
...
@@ -105,7 +109,7 @@ check_x11_support () {
need_xvfb
()
{
check_x11_support
type
Xvfb
>
/dev/null 2>&1
||
test_skip
[
-n
"
$XVFB
"
]
||
test_skip
}
need_tcputils
()
{
...
...
@@ -191,7 +195,7 @@ spawn_lshg () {
}
spawn_xvfb
()
{
Xvfb
-nolisten
tcp
$TEST_DISPLAY
&
$XVFB
-nolisten
tcp
$TEST_DISPLAY
&
at_exit
"kill
$!
"
sleep
3
xauth generate
$TEST_DISPLAY
.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment