test/run-test.sh | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 5886d98c368cdb76ddedc48aedbab45a5c7e96f6
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Nov 24 10:46:34 2015 +0900
Bug 93075 - Possible fix for make check failure on msys/MinGW...
Patch from Christian Fafard
diff --git a/test/run-test.sh b/test/run-test.sh
index d451a8d..97df6e5 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"
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
