diff options
| author | Dodji Seketeli <dodji@gnome.org> | 2004-03-04 00:41:18 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@src.gnome.org> | 2004-03-04 00:41:18 +0000 |
| commit | 586d0453fb8d672415039b3fef920535e463657e (patch) | |
| tree | 7a3d8d8795b7b12b877a8cc70d3f452223271478 /tests | |
| parent | 4d573434939be5fd0c05c2aaa172c1a75a5f10a4 (diff) | |
| download | libcroco-586d0453fb8d672415039b3fef920535e463657e.tar.gz | |
applied a patch from Kjartan Maraas to replace the g_strup()
2004-03-04 Dodji Seketeli <dodji@gnome.org>
* src/cr-enc-handler.c:
(cr_enc_handler_resolve_enc_alias): applied a patch
from Kjartan Maraas to replace the g_strup() g_ascii_strup().
This closes
* csslint/Makefile.am,src/cr-simple-sel.h,src/cr-term.h
src/cr-token.h,tests/Makefile.am:
Applied patch
http://bugzilla.gnome.org/showattachment.cgi?attach_id=23422.
Modified the patch a little bit so that I use prog_LDFLAGS instead
of AM_LDFLAGS. AM_LDFLAGS just seems not to be supported by my
automake-1.4.
This fixes http://bugzilla.gnome.org/show_bug.cgi?id=131643 .
* tests/test-output-refs/test4.2.css.out: updated this non
regresstion test reference output due to a small modification
in the @page rule dump format.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/test-output-refs/test4.2.css.out | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d2bd1fd..e17e2fa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,22 +1,28 @@ SUBDIRS=test-inputs test-output-refs #the list of all possible tests goes here. -#The real tests that are gonna be compiled are defined -#in configure.in due to automake AM_CONDITIONAL() being bugged + +EXTRALDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@ testprogs=test0 test1 test2 test3 test4 test5 test6 noinst_PROGRAMS=$(testprogs) test0_SOURCES=test0-main.c +test0_LDFLAGS=$(EXTRALDFLAGS) test1_SOURCES=test1-main.c +test1_LDFLAGS=$(EXTRALDFLAGS) test2_SOURCES=test2-main.c cr-test-utils.c cr-test-utils.h +test2_LDFLAGS=$(EXTRALDFLAGS) test3_SOURCES=test3-main.c cr-test-utils.c cr-test-utils.h +test3_LDFLAGS=$(EXTRALDFLAGS) test4_SOURCES=test4-main.c cr-test-utils.c cr-test-utils.h +test4_LDFLAGS=$(EXTRALDFLAGS) test5_SOURCES=test5-main.c cr-test-utils.c cr-test-utils.h +test5_LDFLAGS=$(EXTRALDFLAGS) test6_SOURCES=test6-main.c cr-test-utils.c cr-test-utils.h +test6_LDFLAGS=$(EXTRALDFLAGS) croco_lib=$(top_builddir)/src/@CROCO_LIB@ LDADD=$(croco_lib) INCLUDES=-I$(top_srcdir)/intl -I$(top_srcdir)/src -LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@ AM_CFLAGS=-I. @LIBXML2_CFLAGS@ @GLIB2_CFLAGS@ diff --git a/tests/test-output-refs/test4.2.css.out b/tests/test-output-refs/test4.2.css.out index ed74f8d..ae12244 100644 --- a/tests/test-output-refs/test4.2.css.out +++ b/tests/test-output-refs/test4.2.css.out @@ -7,7 +7,7 @@ src : url(http://site/fonts/rob-celt) } -@page left:one-two { +@page left :one-two { margin : 10pt; border : none } |