summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-08-15 16:34:20 -0700
committerAaron Plattner <aplattner@nvidia.com>2010-08-15 16:49:46 -0700
commitb2eac650e158f7d56ebed55ca7603db614b1d415 (patch)
treefc7278efd8d1040e060b4f0aa2a4e3ab5422613e
parent4f4d1da480cf5d073031e8ec0c301e6ef4168270 (diff)
xts5: Construct an absolute XT_FONTPATH
This fixes tests such as XCreateGlyphCursor that fail with UNRESOLVED when run while the test suite is not installed because the tests pass "../xts5/fonts" as a font path to the server, which fails because the server doesn't look in the same directory. Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-rwxr-xr-xxts5/bin/xts-config.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/xts5/bin/xts-config.in b/xts5/bin/xts-config.in
index 0e8db47e..4a11a398 100755
--- a/xts5/bin/xts-config.in
+++ b/xts5/bin/xts-config.in
@@ -3,6 +3,7 @@
use warnings;
use strict;
use Sys::Hostname;
+use Cwd 'abs_path';
BEGIN
{
@@ -12,6 +13,7 @@ BEGIN
$xdpyinfo = $ENV{"XDPYINFO"} or $xdpyinfo = "xdpyinfo";
my $tet_root;
$tet_root = $ENV{"TET_ROOT"} or $tet_root = "%DEFAULT_TET_ROOT%";
+ $tet_root = abs_path($tet_root);
open(XSET, "$xset q |") or die "$xset q failed, giving up.\n";
while(<XSET>)