From a1c8d1d0cc4891a9bc9443ef07cd344e6bde8c9e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 18 Dec 2009 15:44:44 +0000 Subject: bug fix for 'make check' in texk/xdvk/ with abs srcdir git-svn-id: svn://tug.org/texlive/trunk@16446 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvik/ChangeLog.TL | 5 +++++ Build/source/texk/xdvik/tests/test_string_utils.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index 6ed584588ae..3b269da8c39 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: Changes for xdvik (TeX Live) ================================================== +2009-12-18 Peter Breitenlohner + + * tests/test_string_utils.c (test_expand_filename): + Do not prepend cwd to absolute filenames. + 2009-11-17 Peter Breitenlohner * configure.ac: Suppress some compiler warnings (too many). diff --git a/Build/source/texk/xdvik/tests/test_string_utils.c b/Build/source/texk/xdvik/tests/test_string_utils.c index 086d54dad13..b3cb9a70cf4 100644 --- a/Build/source/texk/xdvik/tests/test_string_utils.c +++ b/Build/source/texk/xdvik/tests/test_string_utils.c @@ -321,8 +321,13 @@ static Boolean test_expand_filename(int verbose) globals.dvi_file.dirname = xstrcat(globals.dvi_file.dirname, "/"); testpath2 = expand_filename(__FILE__, USE_DVI_PATH); - currpath = xstrcat(currpath, "/"); - currpath = xstrcat(currpath, __FILE__); + if (__FILE__[0] == '/') { + free(currpath); + currpath = xstrdup(__FILE__); + } else { + currpath = xstrcat(currpath, "/"); + currpath = xstrcat(currpath, __FILE__); + } return test_str_equality(verbose, testpath1, currpath) \ && test_str_equality(verbose, testpath2, currpath); -- cgit v1.2.3