diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /fontconfig/test | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'fontconfig/test')
| -rw-r--r-- | fontconfig/test/Makefile.am | 4 | ||||
| -rw-r--r-- | fontconfig/test/run-test.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fontconfig/test/Makefile.am b/fontconfig/test/Makefile.am index 72da8d64a..3fd343a24 100644 --- a/fontconfig/test/Makefile.am +++ b/fontconfig/test/Makefile.am @@ -1,5 +1,5 @@ check_SCRIPTS=run-test.sh -TESTS_ENVIRONMENT=src=${srcdir} sh +TESTS_ENVIRONMENT=src=${srcdir} EXEEXT=${EXEEXT} sh TESTS=run-test.sh TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in @@ -7,3 +7,5 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA) CLEANFILES= + +-include $(top_srcdir)/git.mk diff --git a/fontconfig/test/run-test.sh b/fontconfig/test/run-test.sh index e7174b289..24ca296bb 100644 --- a/fontconfig/test/run-test.sh +++ b/fontconfig/test/run-test.sh @@ -6,8 +6,8 @@ CACHEDIR=`pwd`/cache.dir ECHO=true -FCLIST=../fc-list/fc-list -FCCACHE=../fc-cache/fc-cache +FCLIST=../fc-list/fc-list$EXEEXT +FCCACHE=../fc-cache/fc-cache$EXEEXT FONT1=$TESTDIR/4x6.pcf FONT2=$TESTDIR/8x16.pcf |