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/12/05 10:06:32 UTC

svn commit: r354025 - in /webservices/axis2/trunk/c/test/unit: ./ core/context/ core/description/ core/engine/ core/phaseresolver/ util/ xml/om/

Author: damitha
Date: Mon Dec  5 01:06:00 2005
New Revision: 354025

URL: http://svn.apache.org/viewcvs?rev=354025&view=rev
Log:
resolved dependancies in unit tests after moving them into
seperate folder

Added:
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/main.c
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.h
Modified:
    webservices/axis2/trunk/c/test/unit/Makefile.am
    webservices/axis2/trunk/c/test/unit/Makefile.in
    webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
    webservices/axis2/trunk/c/test/unit/core/context/Makefile.in
    webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
    webservices/axis2/trunk/c/test/unit/core/description/Makefile.in
    webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
    webservices/axis2/trunk/c/test/unit/core/engine/Makefile.in
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.in
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c
    webservices/axis2/trunk/c/test/unit/main.c
    webservices/axis2/trunk/c/test/unit/util/Makefile.am
    webservices/axis2/trunk/c/test/unit/util/Makefile.in
    webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
    webservices/axis2/trunk/c/test/unit/xml/om/Makefile.in

Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Mon Dec  5 01:06:00 2005
@@ -5,14 +5,25 @@
 main_unit_test_suite_SOURCES = main.c
 
 main_unit_test_suite_LDADD   =  $(LDFLAGS) \
-                    -L$(top_builddir)/test/test/unit/core/description/.libs -ltest_description \
-                    -L$(top_builddir)/test/test/unit/core/engine/.libs -ltest_engine \
-                    -L$(top_builddir)/test/test/unit/core/context/.libs -ltest_context \
-                    -L$(top_builddir)/test/test/unit/core/phaseresolver/.libs -ltest_phaseresolver \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
+                    -L$(top_builddir)/test/unit/core/description/.libs -ltest_description \
+                    -L$(top_builddir)/test/unit/core/engine/.libs -ltest_engine \
+                    -L$(top_builddir)/test/unit/core/context/.libs -ltest_context \
+                    -L$(top_builddir)/test/unit/core/phaseresolver/.libs -ltest_phaseresolver \
                     -L$(top_builddir)/test/unit/util/.libs -ltest_util \
                     -L$(top_builddir)/test/unit/xml/om/.libs -ltest_om \
-                    -L$(top_builddir)/install/lib -laxis2_guththila \
-                    -L$(top_builddir)/install/lib -lguththila
+                    -L$(top_builddir)/install/lib \
+                    -laxis2_guththila \
+                    -lguththila \
+                    -laxis2_util \
+                    -laxis2_om \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_context \
+                    -laxis2_phaseresolver \
+                    -laxis2_wsdl
+                    
 
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/test/unit/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.in Mon Dec  5 01:06:00 2005
@@ -194,14 +194,24 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 main_unit_test_suite_SOURCES = main.c
 main_unit_test_suite_LDADD = $(LDFLAGS) \
-                    -L$(top_builddir)/test/test/unit/core/description/.libs -ltest_description \
-                    -L$(top_builddir)/test/test/unit/core/engine/.libs -ltest_engine \
-                    -L$(top_builddir)/test/test/unit/core/context/.libs -ltest_context \
-                    -L$(top_builddir)/test/test/unit/core/phaseresolver/.libs -ltest_phaseresolver \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
+                    -L$(top_builddir)/test/unit/core/description/.libs -ltest_description \
+                    -L$(top_builddir)/test/unit/core/engine/.libs -ltest_engine \
+                    -L$(top_builddir)/test/unit/core/context/.libs -ltest_context \
+                    -L$(top_builddir)/test/unit/core/phaseresolver/.libs -ltest_phaseresolver \
                     -L$(top_builddir)/test/unit/util/.libs -ltest_util \
                     -L$(top_builddir)/test/unit/xml/om/.libs -ltest_om \
-                    -L$(top_builddir)/install/lib -laxis2_guththila \
-                    -L$(top_builddir)/install/lib -lguththila
+                    -L$(top_builddir)/install/lib \
+                    -laxis2_guththila \
+                    -lguththila \
+                    -laxis2_util \
+                    -laxis2_om \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_context \
+                    -laxis2_phaseresolver \
+                    -laxis2_wsdl
 
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Mon Dec  5 01:06:00 2005
@@ -3,7 +3,7 @@
 prglib_LTLIBRARIES = libtest_context.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_context_la_SOURCES = context_test.c
-include_HEADERS=$(top_builddir)/modules/core/context/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/core/context/*.h
 
 
 INCLUDES = -I$(top_builddir)/include \
@@ -13,6 +13,8 @@
 prgbin_PROGRAMS = context_test
 context_test_SOURCES = main.c
 context_test_LDADD   =  $(LDFLAGS) libtest_context.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \

Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/context/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.in Mon Dec  5 01:06:00 2005
@@ -204,13 +204,15 @@
 prglib_LTLIBRARIES = libtest_context.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_context_la_SOURCES = context_test.c
-include_HEADERS = $(top_builddir)/modules/core/context/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/core/context/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 context_test_SOURCES = main.c
 context_test_LDADD = $(LDFLAGS) libtest_context.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \
@@ -422,7 +424,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/core/context/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/core/context
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Mon Dec  5 01:06:00 2005
@@ -3,7 +3,7 @@
 prglib_LTLIBRARIES = libtest_description.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_description_la_SOURCES = description_test.c
-include_HEADERS=$(top_builddir)/modules/core/description/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/core/description/*.h
 
 
 INCLUDES = -I$(top_builddir)/include \
@@ -13,6 +13,8 @@
 prgbin_PROGRAMS = description_test
 description_test_SOURCES = main.c
 description_test_LDADD   =  $(LDFLAGS) libtest_description.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \

Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.in Mon Dec  5 01:06:00 2005
@@ -207,13 +207,15 @@
 prglib_LTLIBRARIES = libtest_description.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_description_la_SOURCES = description_test.c
-include_HEADERS = $(top_builddir)/modules/core/description/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/core/description/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 description_test_SOURCES = main.c
 description_test_LDADD = $(LDFLAGS) libtest_description.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \
@@ -425,7 +427,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/core/description/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/core/description
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Mon Dec  5 01:06:00 2005
@@ -3,7 +3,7 @@
 prglib_LTLIBRARIES = libtest_engine.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_engine_la_SOURCES = engine_test.c
-include_HEADERS=$(top_builddir)/modules/core/engine/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/core/engine/*.h
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
@@ -12,6 +12,8 @@
 prgbin_PROGRAMS = engine_test
 engine_test_SOURCES = main.c
 engine_test_LDADD   =  $(LDFLAGS) libtest_engine.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \

Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.in Mon Dec  5 01:06:00 2005
@@ -204,13 +204,15 @@
 prglib_LTLIBRARIES = libtest_engine.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_engine_la_SOURCES = engine_test.c
-include_HEADERS = $(top_builddir)/modules/core/engine/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/core/engine/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 engine_test_SOURCES = main.c
 engine_test_LDADD = $(LDFLAGS) libtest_engine.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \
@@ -422,7 +424,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/core/engine/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/core/engine
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Mon Dec  5 01:06:00 2005
@@ -3,7 +3,7 @@
 prglib_LTLIBRARIES = libtest_phaseresolver.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_phaseresolver_la_SOURCES = phaseresolver_test.c
-include_HEADERS=$(top_builddir)/modules/core/phaseresolver/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/core/phaseresolver/*.h
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
@@ -12,6 +12,8 @@
 prgbin_PROGRAMS = phaseresolver_test
 phaseresolver_test_SOURCES = main.c
 phaseresolver_test_LDADD   =  $(LDFLAGS) libtest_phaseresolver.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \

Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.in Mon Dec  5 01:06:00 2005
@@ -208,13 +208,15 @@
 prglib_LTLIBRARIES = libtest_phaseresolver.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_phaseresolver_la_SOURCES = phaseresolver_test.c
-include_HEADERS = $(top_builddir)/modules/core/phaseresolver/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/core/phaseresolver/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 phaseresolver_test_SOURCES = main.c
 phaseresolver_test_LDADD = $(LDFLAGS) libtest_phaseresolver.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \
@@ -426,7 +428,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/core/phaseresolver/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/core/phaseresolver
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Added: webservices/axis2/trunk/c/test/unit/core/phaseresolver/main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/main.c?rev=354025&view=auto
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/main.c (added)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/main.c Mon Dec  5 01:06:00 2005
@@ -0,0 +1,18 @@
+#include "phaseresolver_test.h"
+
+void RunAllTests(void) {
+    CuString *output = CuStringNew();
+    CuSuite* suite = CuSuiteNew();
+
+    CuSuiteAddSuite(suite, axis2_phaseresolverGetSuite());
+
+    CuSuiteRun(suite);
+    CuSuiteSummary(suite, output);
+    CuSuiteDetails(suite, output);
+    printf("%s\n", output->buffer);
+}
+
+int main(void) {
+    RunAllTests();
+    return 0;
+}

Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c Mon Dec  5 01:06:00 2005
@@ -0,0 +1,12 @@
+#include "phaseresolver_test.h"
+#include <string.h>
+#include <stdio.h>
+#include <axis2_allocator.h>
+#include <axis2_env.h>
+
+CuSuite* axis2_phaseresolverGetSuite() {
+    CuSuite* suite = CuSuiteNew();
+    /*SUITE_ADD_TEST(suite, Testaxis2_stream_ops_read);*/
+    return suite;
+}
+

Added: webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.h?rev=354025&view=auto
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.h (added)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.h Mon Dec  5 01:06:00 2005
@@ -0,0 +1,8 @@
+#ifndef PHASERESOLVER_TEST_H
+#define PHASERESOLVER_TEST_H
+
+#include <CuTest.h>
+
+CuSuite* axis2_phaseresolverGetSuite();
+
+#endif /* PHASERESOLVER_TEST_H */

Modified: webservices/axis2/trunk/c/test/unit/main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/main.c?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/main.c (original)
+++ webservices/axis2/trunk/c/test/unit/main.c Mon Dec  5 01:06:00 2005
@@ -7,7 +7,7 @@
     CuSuite* suite = CuSuiteNew();
 
     CuSuiteAddSuite(suite, axis2_utilGetSuite());
-    CuSuiteAddSuite(suite, axis2_commonGetSuite());
+    /*CuSuiteAddSuite(suite, axis2_commonGetSuite());*/
     CuSuiteAddSuite(suite, axis2_omGetSuite());
 
     CuSuiteRun(suite);

Modified: webservices/axis2/trunk/c/test/unit/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.am Mon Dec  5 01:06:00 2005
@@ -10,7 +10,7 @@
                             util_array_list_test.c\
                             util_linked_list_test.c
 
-include_HEADERS=$(top_builddir)/modules/util/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/util/*.h
 
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \

Modified: webservices/axis2/trunk/c/test/unit/util/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.in Mon Dec  5 01:06:00 2005
@@ -214,7 +214,7 @@
                             util_array_list_test.c\
                             util_linked_list_test.c
 
-include_HEADERS = $(top_builddir)/modules/util/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/util/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
@@ -441,7 +441,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/util/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/util
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \

Modified: webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am Mon Dec  5 01:06:00 2005
@@ -5,7 +5,7 @@
 libtest_om_la_SOURCES = om_test.c om_node_test.c
 
                         
-include_HEADERS=$(top_builddir)/modules/xml/om/test/*.h
+include_HEADERS=$(top_builddir)/test/unit/xml/om/*.h
 
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
@@ -14,6 +14,8 @@
 prgbin_PROGRAMS = om_test
 om_test_SOURCES = main.c
 om_test_LDADD   =  $(LDFLAGS) libtest_om.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \

Modified: webservices/axis2/trunk/c/test/unit/xml/om/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/xml/om/Makefile.in?rev=354025&r1=354024&r2=354025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.in Mon Dec  5 01:06:00 2005
@@ -204,13 +204,15 @@
 prglib_LTLIBRARIES = libtest_om.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_om_la_SOURCES = om_test.c om_node_test.c
-include_HEADERS = $(top_builddir)/modules/xml/om/test/*.h
+include_HEADERS = $(top_builddir)/test/unit/xml/om/*.h
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
 
 om_test_SOURCES = main.c
 om_test_LDADD = $(LDFLAGS) libtest_om.la  \
+                     -L$(CUTEST_HOME)/lib \
+                     -lcutest \
                     -L$(top_builddir)/install/lib \
                     -laxis2_util \
                     -laxis2_context \
@@ -423,7 +425,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_builddir)/modules/xml/om/test
+	$(mkdir_p) $(distdir)/$(top_builddir)/test/unit/xml/om
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \