aboutsummaryrefslogtreecommitdiffstats
path: root/libical/src/test
diff options
context:
space:
mode:
authorSeth Alves <alves@src.gnome.org>2000-06-07 06:48:11 +0800
committerSeth Alves <alves@src.gnome.org>2000-06-07 06:48:11 +0800
commitaf805a2733c9e2ca44e27360c6162d60cfc1aa53 (patch)
treee55d899b9ff25915fc96362b86efd5fbb3b0d0e7 /libical/src/test
parentf03975a652d1c91bad5a5b107ffaaea0889a5766 (diff)
downloadgsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar.gz
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar.bz2
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar.lz
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar.xz
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.tar.zst
gsoc2013-evolution-af805a2733c9e2ca44e27360c6162d60cfc1aa53.zip
merge libical-0.17 onto the head
svn path=/trunk/; revision=3449
Diffstat (limited to 'libical/src/test')
-rw-r--r--libical/src/test/Makefile.am5
-rw-r--r--libical/src/test/Makefile.in137
-rw-r--r--libical/src/test/icaltestparser.c3
-rw-r--r--libical/src/test/usecases.c8
4 files changed, 49 insertions, 104 deletions
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
index 50810f4b95..93d18993d9 100644
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@@ -1,5 +1,5 @@
-noinst_PROGRAMS = usecases copycluster regression parser findobj storage
+noinst_PROGRAMS = usecases copycluster regression parser findobj storage stow
LDADD = ../libical/libical.la ../libicalss/libicalss.la
INCLUDES = -I$(srcdir) -I$(srcdir)/../libical -I$(srcdir)/../libicalss -I../libical
@@ -9,4 +9,5 @@ usecases_SOURCES = usecases.c
copycluster_SOURCES = copycluster.c
regression_SOURCES = regression.c
parser_SOURCES = icaltestparser.c
-storage_SOURCES = storage.c \ No newline at end of file
+storage_SOURCES = storage.c
+stow_SOURCES = stow.c \ No newline at end of file
diff --git a/libical/src/test/Makefile.in b/libical/src/test/Makefile.in
index 7cb60bdc26..eaec52b6cd 100644
--- a/libical/src/test/Makefile.in
+++ b/libical/src/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -57,26 +58,20 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
AR = @AR@
-AS = @AS@
CC = @CC@
-DLLTOOL = @DLLTOOL@
LEX = @LEX@
-LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
YACC = @YACC@
-noinst_PROGRAMS = usecases copycluster regression parser findobj storage
+noinst_PROGRAMS = usecases copycluster regression parser findobj storage stow
-LDADD = ../libical/libical.la ../libicalss/libicalss.la
-INCLUDES = -I$(srcdir) -I$(srcdir)/../libical -I$(srcdir)/../libicalss -I../libical
+LDADD = ../libical/libical.a ../libicalss/libicalss.a
+INCLUDES = -I . -I../libical -I../libicalss
findobj_SOURCES = findobj.c
usecases_SOURCES = usecases.c
@@ -84,6 +79,7 @@ copycluster_SOURCES = copycluster.c
regression_SOURCES = regression.c
parser_SOURCES = icaltestparser.c
storage_SOURCES = storage.c
+stow_SOURCES = stow.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
@@ -96,35 +92,37 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
usecases_OBJECTS = usecases.o
usecases_LDADD = $(LDADD)
-usecases_DEPENDENCIES = ../libical/libical.la ../libicalss/libicalss.la
+usecases_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
usecases_LDFLAGS =
copycluster_OBJECTS = copycluster.o
copycluster_LDADD = $(LDADD)
-copycluster_DEPENDENCIES = ../libical/libical.la \
-../libicalss/libicalss.la
+copycluster_DEPENDENCIES = ../libical/libical.a \
+../libicalss/libicalss.a
copycluster_LDFLAGS =
regression_OBJECTS = regression.o
regression_LDADD = $(LDADD)
-regression_DEPENDENCIES = ../libical/libical.la \
-../libicalss/libicalss.la
+regression_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
regression_LDFLAGS =
parser_OBJECTS = icaltestparser.o
parser_LDADD = $(LDADD)
-parser_DEPENDENCIES = ../libical/libical.la ../libicalss/libicalss.la
+parser_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
parser_LDFLAGS =
findobj_OBJECTS = findobj.o
findobj_LDADD = $(LDADD)
-findobj_DEPENDENCIES = ../libical/libical.la ../libicalss/libicalss.la
+findobj_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
findobj_LDFLAGS =
storage_OBJECTS = storage.o
storage_LDADD = $(LDADD)
-storage_DEPENDENCIES = ../libical/libical.la ../libicalss/libicalss.la
+storage_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
storage_LDFLAGS =
+stow_OBJECTS = stow.o
+stow_LDADD = $(LDADD)
+stow_DEPENDENCIES = ../libical/libical.a ../libicalss/libicalss.a
+stow_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = Makefile.am Makefile.in
@@ -132,18 +130,16 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
-DEP_FILES = .deps/copycluster.P .deps/findobj.P .deps/icaltestparser.P \
-.deps/regression.P .deps/storage.P .deps/usecases.P
-SOURCES = $(usecases_SOURCES) $(copycluster_SOURCES) $(regression_SOURCES) $(parser_SOURCES) $(findobj_SOURCES) $(storage_SOURCES)
-OBJECTS = $(usecases_OBJECTS) $(copycluster_OBJECTS) $(regression_OBJECTS) $(parser_OBJECTS) $(findobj_OBJECTS) $(storage_OBJECTS)
+SOURCES = $(usecases_SOURCES) $(copycluster_SOURCES) $(regression_SOURCES) $(parser_SOURCES) $(findobj_SOURCES) $(storage_SOURCES) $(stow_SOURCES)
+OBJECTS = $(usecases_OBJECTS) $(copycluster_OBJECTS) $(regression_OBJECTS) $(parser_OBJECTS) $(findobj_OBJECTS) $(storage_OBJECTS) $(stow_OBJECTS)
all: all-redirect
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -157,6 +153,9 @@ distclean-noinstPROGRAMS:
maintainer-clean-noinstPROGRAMS:
+.c.o:
+ $(COMPILE) -c $<
+
.s.o:
$(COMPILE) -c $<
@@ -173,22 +172,6 @@ distclean-compile:
maintainer-clean-compile:
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
usecases: $(usecases_OBJECTS) $(usecases_DEPENDENCIES)
@rm -f usecases
$(LINK) $(usecases_LDFLAGS) $(usecases_OBJECTS) $(usecases_LDADD) $(LIBS)
@@ -213,6 +196,10 @@ storage: $(storage_OBJECTS) $(storage_DEPENDENCIES)
@rm -f storage
$(LINK) $(storage_LDFLAGS) $(storage_OBJECTS) $(storage_LDADD) $(LIBS)
+stow: $(stow_OBJECTS) $(stow_DEPENDENCIES)
+ @rm -f stow
+ $(LINK) $(stow_LDFLAGS) $(stow_OBJECTS) $(stow_LDADD) $(LIBS)
+
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -247,11 +234,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = src/test
distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
@@ -262,38 +244,6 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
- -rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
-%.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
@@ -316,7 +266,7 @@ uninstall: uninstall-am
all-am: Makefile $(PROGRAMS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
installdirs:
@@ -330,26 +280,22 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
+ mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am
-clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
- clean-depend clean-generic mostlyclean-am
+clean-am: clean-noinstPROGRAMS clean-compile clean-tags clean-generic \
+ mostlyclean-am
clean: clean-am
-distclean-am: distclean-noinstPROGRAMS distclean-compile \
- distclean-libtool distclean-tags distclean-depend \
+distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-tags \
distclean-generic clean-am
- -rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
- maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-depend \
+ maintainer-clean-compile maintainer-clean-tags \
maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
@@ -359,12 +305,9 @@ maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c
index 3f07fcd044..98dbcff94f 100644
--- a/libical/src/test/icaltestparser.c
+++ b/libical/src/test/icaltestparser.c
@@ -109,8 +109,9 @@ int main(int argc, char* argv[])
c = icalparser_add_line(parser,line);
+
if (c != 0){
- icalcomponent_convert_errors(c);
+ /*icalcomponent_convert_errors(c);*/
printf("%s",icalcomponent_as_ical_string(c));
icalparser_claim(parser);
printf("\n---------------\n");
diff --git a/libical/src/test/usecases.c b/libical/src/test/usecases.c
index 05c295197f..6c27454ae3 100644
--- a/libical/src/test/usecases.c
+++ b/libical/src/test/usecases.c
@@ -177,7 +177,7 @@ icalcomponent* create_new_component()
);
/* add a property that has parameters */
- property = icalproperty_new_organizer(strdup("mrbig@host.com"));
+ property = icalproperty_new_organizer(strdup("mailto:mrbig@host.com"));
icalproperty_add_parameter(
property,
@@ -191,7 +191,7 @@ icalcomponent* create_new_component()
operation is the same as adding a property to a component */
/* add another property that has parameters */
- property = icalproperty_new_attendee(strdup("employee-A@host.com"));
+ property = icalproperty_new_attendee(strdup("mailto:employee-A@host.com"));
icalproperty_add_parameter(
property,
@@ -299,12 +299,12 @@ icalcomponent* create_new_component_with_va_args()
icalproperty_new_dtstamp(atime),
icalproperty_new_uid(strdup("guid-1.host1.com")),
icalproperty_vanew_organizer(
- strdup("mrbig@host.com"),
+ strdup("mailto:mrbig@host.com"),
icalparameter_new_role(ICAL_ROLE_CHAIR),
0
),
icalproperty_vanew_attendee(
- strdup("employee-A@host.com"),
+ strdup("mailto:employee-A@host.com"),
icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
icalparameter_new_rsvp(1),
icalparameter_new_cutype(ICAL_CUTYPE_GROUP),