diff options
| author | Akira TAGOH <akira@tagoh.org> | 2015-11-24 10:46:34 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2015-11-24 10:46:34 +0900 |
| commit | 5886d98c368cdb76ddedc48aedbab45a5c7e96f6 (patch) | |
| tree | 7ce458ddf23d1e6f97ed2b8c17580d7c31dedcdd /test | |
| parent | 1d87fab8b18bf5a497646d98a1c6279372aac4ea (diff) | |
Bug 93075 - Possible fix for make check failure on msys/MinGW...
Patch from Christian Fafard
Diffstat (limited to 'test')
| -rw-r--r-- | test/run-test.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/run-test.sh b/test/run-test.sh index d451a8d8..97df6e54 100644 --- a/test/run-test.sh +++ b/test/run-test.sh @@ -20,10 +20,15 @@ # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -TESTDIR=${srcdir-`pwd`} +case "$OSTYPE" in + msys ) MyPWD=`pwd -W` ;; # On Msys/MinGW, returns a MS Windows style path. + * ) MyPWD=`pwd` ;; # On any other platforms, returns a Unix style path. +esac -FONTDIR=`pwd`/fonts -CACHEDIR=`pwd`/cache.dir +TESTDIR=${srcdir-"$MyPWD"} + +FONTDIR="$MyPWD"/fonts +CACHEDIR="$MyPWD"/cache.dir ECHO=true @@ -62,7 +67,7 @@ dotest () { sed "s!@FONTDIR@!$FONTDIR! s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf -FONTCONFIG_FILE=`pwd`/fonts.conf +FONTCONFIG_FILE="$MyPWD"/fonts.conf export FONTCONFIG_FILE dotest "Basic check" |