From: Roumen Petrov Date: Sun, 12 Jan 2014 17:07:44 +0000 (+0200) Subject: tests: use absolute path of source files X-Git-Tag: v0.19~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e79981d7542606f7c9b91fc4f824fe1a1e05224;p=thirdparty%2Fgettext.git tests: use absolute path of source files Replace ../$srcdir with $abs_srcdir in gettext-tools tests to add support for configuration with absolute path. --- diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index d48aa7b42..12a25cfd6 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -160,6 +160,7 @@ CHECKER = #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \ + abs_srcdir=$(abs_srcdir) \ GETTEXT="$(CHECKER) tstgettext" \ NGETTEXT="$(CHECKER) tstngettext" \ XGETTEXT="$(CHECKER) xgettext" \ diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3 index 9c8082bb4..98737ddb4 100755 --- a/gettext-tools/tests/format-c-3 +++ b/gettext-tools/tests/format-c-3 @@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles fc3.tmp fc3.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc3.tmp --omit-header --no-location ../${srcdir}/format-c-3-prg.c +${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4 index 6a34a84f4..b5f21bdee 100755 --- a/gettext-tools/tests/format-c-4 +++ b/gettext-tools/tests/format-c-4 @@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles fc4.tmp fc4.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc4.tmp --omit-header --no-location ../${srcdir}/format-c-4-prg.c +${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5 index 997d4d6a8..1af04dd6e 100755 --- a/gettext-tools/tests/format-c-5 +++ b/gettext-tools/tests/format-c-5 @@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles fc5.tmp fc5.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc5.tmp --omit-header --no-location ../${srcdir}/format-c-5-prg.c +${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1 index acc8feea9..e75668422 100755 --- a/gettext-tools/tests/gettext-1 +++ b/gettext-tools/tests/gettext-1 @@ -10,7 +10,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles gt-1" test -d gt-1 || mkdir gt-1 test -d gt-1/LC_MESSAGES || mkdir gt-1/LC_MESSAGES -cp ../$srcdir/test.mo gt-1/LC_MESSAGES +cp "$abs_srcdir"/test.mo gt-1/LC_MESSAGES tmpfiles="$tmpfiles gt-test1.out" : ${GETTEXT=gettext} diff --git a/gettext-tools/tests/gettext-2 b/gettext-tools/tests/gettext-2 index 387816dab..6b4b29e45 100755 --- a/gettext-tools/tests/gettext-2 +++ b/gettext-tools/tests/gettext-2 @@ -22,7 +22,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles gt-2" test -d gt-2 || mkdir gt-2 test -d gt-2/LC_MESSAGES || mkdir gt-2/LC_MESSAGES -cp ../$srcdir/test.mo gt-2/LC_MESSAGES +cp "$abs_srcdir"/test.mo gt-2/LC_MESSAGES tmpfiles="$tmpfiles gt-test2.out" : ${GETTEXT=gettext} diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3 index 974afd5a9..51290d409 100755 --- a/gettext-tools/tests/gettext-3 +++ b/gettext-tools/tests/gettext-3 @@ -40,8 +40,8 @@ test -d gt-3/fr_FR || mkdir gt-3/fr_FR test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-1.po -${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-2.po +${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-1.po +${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-2.po tmpfiles="$tmpfiles gt-3.ok" cat < gt-3.ok diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4 index 5573e5fff..3b9885fec 100755 --- a/gettext-tools/tests/gettext-4 +++ b/gettext-tools/tests/gettext-4 @@ -28,7 +28,7 @@ test -d gt-4/fr || mkdir gt-4/fr test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-4.po +${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-4.po ../gettext-4-prg $LOCALE_FR || exit 1 diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5 index 747a98cd6..3e9306bb7 100755 --- a/gettext-tools/tests/gettext-5 +++ b/gettext-tools/tests/gettext-5 @@ -39,7 +39,7 @@ test -d gt-5/de_DE || mkdir gt-5/de_DE test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-5.po +${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-5.po ../gettext-5-prg || exit 1 diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6 index 8ace39fe8..0ff96a430 100755 --- a/gettext-tools/tests/gettext-6 +++ b/gettext-tools/tests/gettext-6 @@ -40,8 +40,8 @@ test -d gt-6/fr_FR || mkdir gt-6/fr_FR test -d gt-6/fr_FR/LC_MESSAGES || mkdir gt-6/fr_FR/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-1.po -${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-2.po +${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-1.po +${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-2.po tmpfiles="$tmpfiles gt-6.ok" cat < gt-6.ok diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7 index 9a66320f1..c10dac60b 100755 --- a/gettext-tools/tests/gettext-7 +++ b/gettext-tools/tests/gettext-7 @@ -39,7 +39,7 @@ test -d gt-7/de_DE || mkdir gt-7/de_DE test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-7.po +${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-7.po tmpfiles="$tmpfiles gt-7.out" ../gettext-7-prg > gt-7.out diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1 index e40a7eb99..e0a1abf17 100755 --- a/gettext-tools/tests/gettextpo-1 +++ b/gettext-tools/tests/gettextpo-1 @@ -3,13 +3,13 @@ # Test the libgettextpo library. tmpfiles="gtpo-1-copied.po gtpo-1-created.po" -../gettextpo-1-prg${EXEEXT} ../${srcdir}/gettextpo-1.de.po > /dev/null +../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} -${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-copied.po +${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-created.po +${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } rm -f $tmpfiles diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23 index b369464ea..ccc0846d3 100755 --- a/gettext-tools/tests/msgcomm-23 +++ b/gettext-tools/tests/msgcomm-23 @@ -7,8 +7,8 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2" -cp ../${srcdir}/msguniq-a.in mcomm-23.in1 -cp ../${srcdir}/msguniq-a.in mcomm-23.in2 +cp "$abs_srcdir"/msguniq-a.in mcomm-23.in1 +cp "$abs_srcdir"/msguniq-a.in mcomm-23.in2 tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out" : ${MSGCOMM=msgcomm} @@ -18,7 +18,7 @@ LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} -${DIFF} ../${srcdir}/msguniq-a.out mcomm-23.out +${DIFF} "$abs_srcdir"/msguniq-a.out mcomm-23.out result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2 index 56371e0bf..c25eabb22 100755 --- a/gettext-tools/tests/msgexec-2 +++ b/gettext-tools/tests/msgexec-2 @@ -81,7 +81,7 @@ LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${CMP=cmp} -${CMP} ../${srcdir}/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null +${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1 index e506c2a1d..73357646c 100755 --- a/gettext-tools/tests/msgfmt-qt-1 +++ b/gettext-tools/tests/msgfmt-qt-1 @@ -8,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles mf-qt-1.qm" : ${MSGFMT=msgfmt} -${MSGFMT} --qt -o mf-qt-1.qm ../${srcdir}/qttest_pl.po +${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${CMP=cmp} -${CMP} ../${srcdir}/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null +${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2 index 7820f6313..eef7531d4 100755 --- a/gettext-tools/tests/msgfmt-qt-2 +++ b/gettext-tools/tests/msgfmt-qt-2 @@ -8,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles mf-qt-2.qm" : ${MSGFMT=msgfmt} -${MSGFMT} --qt ../${srcdir}/qttest2_de.po -o mf-qt-2.qm +${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${CMP=cmp} -${CMP} ../${srcdir}/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null +${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5 index d39b1abc9..bd0a3be0e 100755 --- a/gettext-tools/tests/msgmerge-compendium-5 +++ b/gettext-tools/tests/msgmerge-compendium-5 @@ -9,14 +9,14 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-5.tmp \ - --compendium ../${srcdir}/mm-viet.comp.po \ - /dev/null ../${srcdir}/mm-viet.pot + --compendium "$abs_srcdir"/mm-viet.comp.po \ + /dev/null "$abs_srcdir"/mm-viet.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} -${DIFF} ../${srcdir}/mm-viet.out mm-c-5.out +${DIFF} "$abs_srcdir"/mm-viet.out mm-c-5.out result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 index eb2d64fbc..d0ea9f22c 100755 --- a/gettext-tools/tests/msgmerge-compendium-6 +++ b/gettext-tools/tests/msgmerge-compendium-6 @@ -12,21 +12,21 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles mm-ko.utf-8.pot" : ${MSGCONV=msgconv} -${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ../${srcdir}/mm-ko.ascii.pot +${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$abs_srcdir"/mm-ko.ascii.pot tmpfiles="$tmpfiles mm-ko.utf-8.po" : ${MSGCONV=msgconv} -${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ../${srcdir}/mm-ko.euc-kr.po +${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po "$abs_srcdir"/mm-ko.euc-kr.po tmpfiles="$tmpfiles mm-ko-comp.utf-8.po" : ${MSGCONV=msgconv} -${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ../${srcdir}/mm-ko-comp.euc-kr.po +${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-kr.po tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AEE.tmp \ - --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \ - ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot + --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ + "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -35,7 +35,7 @@ tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AEU.tmp \ --compendium mm-ko-comp.utf-8.po \ - ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot + "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -43,8 +43,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AUE.tmp \ - --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \ - mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot + --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ + mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -53,7 +53,7 @@ tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AUU.tmp \ --compendium mm-ko-comp.utf-8.po \ - mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot + mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -61,8 +61,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UEE.tmp \ - --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \ - ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot + --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ + "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -71,7 +71,7 @@ tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UEU.tmp \ --compendium mm-ko-comp.utf-8.po \ - ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot + "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -79,7 +79,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UUE.tmp \ - --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \ + --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ mm-ko.utf-8.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1 index 5616f26bb..ef16fca17 100755 --- a/gettext-tools/tests/msguniq-1 +++ b/gettext-tools/tests/msguniq-1 @@ -8,13 +8,13 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -o msguniq-1.tmp ../${srcdir}/msguniq-a.in +${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} -${DIFF} ../${srcdir}/msguniq-a.out msguniq-1.out +${DIFF} "$abs_srcdir"/msguniq-a.out msguniq-1.out result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2 index 45a54e79d..c9d52c6c6 100755 --- a/gettext-tools/tests/msguniq-2 +++ b/gettext-tools/tests/msguniq-2 @@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ../${srcdir}/msguniq-a.in +${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3 index 5322b51e5..64ff14998 100755 --- a/gettext-tools/tests/msguniq-3 +++ b/gettext-tools/tests/msguniq-3 @@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ../${srcdir}/msguniq-a.in +${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4 index 1cd63b809..afa67fae3 100755 --- a/gettext-tools/tests/msguniq-4 +++ b/gettext-tools/tests/msguniq-4 @@ -8,12 +8,12 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles msguniq-4.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ../${srcdir}/msguniq-a.inp +${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles msguniq-4.ok" : ${MSGCAT-msgcat} -${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ../${srcdir}/msguniq-a.out +${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1 index 944374aa3..49f7a36ff 100644 --- a/gettext-tools/tests/plural-1 +++ b/gettext-tools/tests/plural-1 @@ -6,7 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles plural-1-cake.tmp plural-1-cake.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location ../${srcdir}/plural-1-prg.c +${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1 index 11cf9607b..084df37f6 100755 --- a/gettext-tools/tests/xgettext-c-1 +++ b/gettext-tools/tests/xgettext-c-1 @@ -17,7 +17,7 @@ LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} -${DIFF} ../$srcdir/xg-c-1.ok.po xg-c-1.po +${DIFF} "$abs_srcdir"/xg-c-1.ok.po xg-c-1.po result=$? rm -fr $tmpfiles