You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/10/13 08:53:28 UTC
svn commit: r320677 - in /webservices/axis2/trunk/c/modules/test/unit:
Makefile.am Makefile.in main.c
Author: damitha
Date: Wed Oct 12 23:53:22 2005
New Revision: 320677
URL: http://svn.apache.org/viewcvs?rev=320677&view=rev
Log:
Updating the main test suite
Modified:
webservices/axis2/trunk/c/modules/test/unit/Makefile.am
webservices/axis2/trunk/c/modules/test/unit/Makefile.in
webservices/axis2/trunk/c/modules/test/unit/main.c
Modified: webservices/axis2/trunk/c/modules/test/unit/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/Makefile.am?rev=320677&r1=320676&r2=320677&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.am Wed Oct 12 23:53:22 2005
@@ -1,7 +1,7 @@
bin_PROGRAMS = unit_test
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-unit_test_SOURCES = main.c ../../common/test/common_test.c
+unit_test_SOURCES = main.c
-unit_test_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
+unit_test_LDADD = $(LDFLAGS) ../../common/test/libcommon_test.la ../../util/test/libutil_test.la ../../common/src/libcommon.la ../../util/src/libutil.la -ldl
INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
Modified: webservices/axis2/trunk/c/modules/test/unit/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/Makefile.in?rev=320677&r1=320676&r2=320677&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.in Wed Oct 12 23:53:22 2005
@@ -51,11 +51,13 @@
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_unit_test_OBJECTS = main.$(OBJEXT) common_test.$(OBJEXT)
+am_unit_test_OBJECTS = main.$(OBJEXT)
unit_test_OBJECTS = $(am_unit_test_OBJECTS)
am__DEPENDENCIES_1 =
unit_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- ../../common/src/libcommon.la
+ ../../common/test/libcommon_test.la \
+ ../../util/test/libutil_test.la ../../common/src/libcommon.la \
+ ../../util/src/libutil.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -177,8 +179,8 @@
target_alias = @target_alias@
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-unit_test_SOURCES = main.c ../../common/test/common_test.c
-unit_test_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
+unit_test_SOURCES = main.c
+unit_test_LDADD = $(LDFLAGS) ../../common/test/libcommon_test.la ../../util/test/libutil_test.la ../../common/src/libcommon.la ../../util/src/libutil.la -ldl
INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
all: all-recursive
@@ -251,7 +253,6 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
.c.o:
@@ -274,20 +275,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-common_test.o: ../../common/test/common_test.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common_test.o -MD -MP -MF "$(DEPDIR)/common_test.Tpo" -c -o common_test.o `test -f '../../common/test/common_test.c' || echo '$(srcdir)/'`../../common/test/common_test.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/common_test.Tpo" "$(DEPDIR)/common_test.Po"; else rm -f "$(DEPDIR)/common_test.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/test/common_test.c' object='common_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common_test.o `test -f '../../common/test/common_test.c' || echo '$(srcdir)/'`../../common/test/common_test.c
-
-common_test.obj: ../../common/test/common_test.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common_test.obj -MD -MP -MF "$(DEPDIR)/common_test.Tpo" -c -o common_test.obj `if test -f '../../common/test/common_test.c'; then $(CYGPATH_W) '../../common/test/common_test.c'; else $(CYGPATH_W) '$(srcdir)/../../common/test/common_test.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/common_test.Tpo" "$(DEPDIR)/common_test.Po"; else rm -f "$(DEPDIR)/common_test.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/test/common_test.c' object='common_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common_test.obj `if test -f '../../common/test/common_test.c'; then $(CYGPATH_W) '../../common/test/common_test.c'; else $(CYGPATH_W) '$(srcdir)/../../common/test/common_test.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
Modified: webservices/axis2/trunk/c/modules/test/unit/main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/main.c?rev=320677&r1=320676&r2=320677&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/main.c (original)
+++ webservices/axis2/trunk/c/modules/test/unit/main.c Wed Oct 12 23:53:22 2005
@@ -1,10 +1,12 @@
#include <CuTest.h>
+#include "../../util/test/util_test.h"
#include "../../common/test/common_test.h"
void RunAllTests(void) {
CuString *output = CuStringNew();
CuSuite* suite = CuSuiteNew();
+ CuSuiteAddSuite(suite, axis2_utilGetSuite());
CuSuiteAddSuite(suite, axis2_commonGetSuite());
CuSuiteRun(suite);