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/12 12:36:39 UTC

svn commit: r314839 - in /webservices/axis2/trunk/c: ./ include/ modules/common/test/ modules/core/description/src/ modules/test/ modules/test/om/src/

Author: damitha
Date: Wed Oct 12 03:36:07 2005
New Revision: 314839

URL: http://svn.apache.org/viewcvs?rev=314839&view=rev
Log:
enhanced unit tests by adding a main test suite to test the
all unit tests of the application at once

Modified:
    webservices/axis2/trunk/c/configure
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/include/axis2_description_param_include.h
    webservices/axis2/trunk/c/include/axis2_engine_config.h
    webservices/axis2/trunk/c/include/axis2_errno.h
    webservices/axis2/trunk/c/modules/common/test/Makefile.am
    webservices/axis2/trunk/c/modules/common/test/Makefile.in
    webservices/axis2/trunk/c/modules/common/test/common_test.c
    webservices/axis2/trunk/c/modules/common/test/main.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
    webservices/axis2/trunk/c/modules/test/Makefile.am
    webservices/axis2/trunk/c/modules/test/Makefile.in
    webservices/axis2/trunk/c/modules/test/om/src/Makefile.in

Modified: webservices/axis2/trunk/c/configure
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure (original)
+++ webservices/axis2/trunk/c/configure Wed Oct 12 03:36:07 2005
@@ -20511,7 +20511,7 @@
 
 #AC_CHECK_FUNCS([memmove])
 
-                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/xml/Makefile modules/xml/guththila/Makefile modules/xml/guththila/src/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile"
+                                                                                                                                                                                                                                                ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/xml/Makefile modules/xml/guththila/Makefile modules/xml/guththila/src/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile modules/test/common/Makefile modules/test/unit/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -21090,6 +21090,8 @@
   "modules/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/Makefile" ;;
   "modules/test/om/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/om/Makefile" ;;
   "modules/test/om/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/om/src/Makefile" ;;
+  "modules/test/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/common/Makefile" ;;
+  "modules/test/unit/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/unit/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "axis2_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS axis2_config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Oct 12 03:36:07 2005
@@ -50,4 +50,6 @@
     modules/common/test/Makefile \
     modules/test/Makefile \
     modules/test/om/Makefile \
-    modules/test/om/src/Makefile])
+    modules/test/om/src/Makefile \
+    modules/test/common/Makefile \
+    modules/test/unit/Makefile])

Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Wed Oct 12 03:36:07 2005
@@ -1,14 +1,32 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 #ifndef AXIS2_DESCRIPTION_PARAM_INCLUDE_H
 #define AXIS2_DESCRIPTION_PARAM_INCLUDE_H
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <apr_hash.h>
+
 #include <axis2_om_element.h>
 #include <axis2_qname.h>
 #include <axis2.h>
 #include <axis2_parameter.h>
-#include <axis2_errno.h>
-#include <apr_hash.h>
+#include <axis2_error.h>
 
 /**
  * @file axis2_description_param_include.h
@@ -18,33 +36,41 @@
 	
 struct axis2_description_param_include_s;
 	
+typedef struct axis2_description_param_include_ops_s 
+		axis2_description_param_include_ops_t;
+	
 typedef struct axis2_description_param_include_s 
 		axis2_description_param_include_t;
-	
-typedef void (*axis2_description_param_include_add_parameter_t)
-    (axis2_description_param_include_t *param_include,
-     axis2_parameter_t * param);
+
+typedef int (*axis2_description_param_include_free_t) (axis2_description_param_include_t
+    	*param_include);
+
+typedef int (*axis2_description_param_include_add_parameter_t)
+    	(axis2_description_param_include_t *param_include,
+     	axis2_parameter_t * param);
 
 typedef axis2_parameter_t *(*axis2_description_param_include_get_parameter_t)
-    (axis2_description_param_include_t * param_include, char *name);
+    	(axis2_description_param_include_t * param_include, char *name);
 
 typedef apr_hash_t *(*axis2_description_param_include_get_parameters_t)
-    (axis2_description_param_include_t * param_include);
+    	(axis2_description_param_include_t * param_include);
 
 typedef int (*axis2_description_param_include_is_parameter_locked_t)
-    (axis2_description_param_include_t * param_include, char *param_name);
+    	(axis2_description_param_include_t * param_include, char *param_name);
 
 /**
   * Paramter can be any thing it can be XML element with number of child 
   * elements
   */
-typedef struct axis2_description_param_include_ops_s
+struct axis2_description_param_include_ops_s
 {
     axis2_description_param_include_add_parameter_t add_parameter;
 	axis2_description_param_include_get_parameter_t get_parameter;
 	axis2_description_param_include_get_parameters_t get_parameters;
 	axis2_description_param_include_is_parameter_locked_t is_parameter_locked;
-} axis2_description_param_include_ops_t;
+	axis2_description_param_include_free_t free;
+	
+};
 
 struct axis2_description_param_include_s
 {
@@ -56,9 +82,6 @@
 /*
  *	Create a param
  */
-axis2_description_param_include_t *create_axis2_description_param_include ();
-
-void free_axis2_description_param_include (axis2_description_param_include_t
-    *param_include);
+axis2_description_param_include_t *axis2_description_param_include_create ();
 
 #endif //AXIS2_DESCRIPTION_PARAM_INCLUDE_H

Modified: webservices/axis2/trunk/c/include/axis2_engine_config.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_config.h?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_config.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_config.h Wed Oct 12 03:36:07 2005
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 #ifndef AXIS2_ENGINE_CONFIG_H
 #define AXIS2_ENGINE_CONFIG_H
 

Modified: webservices/axis2/trunk/c/include/axis2_errno.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_errno.h?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_errno.h (original)
+++ webservices/axis2/trunk/c/include/axis2_errno.h Wed Oct 12 03:36:07 2005
@@ -1,62 +0,0 @@
-#ifndef AXIS2_ERRNO_H
-#define AXIS2_ERRNO_H
-
-/**
- * @file axis2_errno.h
- * @brief Axis2c Error Codes
- */
-
-/*#include <apr_errno.h>*/
-
-/**
- * AXIS2_START_ERROR is where the AXIS2 specific error values start.
- * In apr_errno.h APR_OS_START_USERERR is defined as start of the 
- * error codes for applications using apr.
- */
-#define AXIS2_START_ERROR    20000
-
-#define AXIS2_ERROR_SPACE    50000
-
-
-#define AXIS2_START_STATUS         AXIS2_START_ERROR + AXIS2_ERROR_SPACE
-
-/** 
- * @defgroup AXIS2_Error AXIS2 Error Values
- * <PRE>
- * <b>AXIS2 ERROR VALUES</b>
- * AXIS2_ERROR_OM_MEMORY_ALLOCATION      AXIS2 was unable to
- *                                        allocate the requested memory for the OM 
- * AXIS2_ERROR_NULL_MEMORY_ACCESS        trying to access unallocated memory
- *
- *</PRE>
- * <PRE>
- * <b>AXIS2 STATUS VALUES</b>
- * AXIS2_SUCCESS                         Success status code
- * AXIS2_FAILIURE                        Failure status code
- *
- * </PRE>
- # @addtogroup AXIS2 Error codes
- * @{
- */
-/** @see AXIS2_ERROR_OM_MEMORY_ALLOCATION */
-#define AXIS2_ERROR_INVALID_POINTER_PARAMATERS        (AXIS2_START_ERROR + 1)
-
-#define AXIS2_ERROR_OM_MEMORY_ALLOCATION        (AXIS2_START_ERROR + 2)
-#define AXIS2_ERROR_NULL_MEMORY_ACCESS        (AXIS2_START_ERROR + 3)
-#define AXIS2_ERROR_MEMORY_ALLOCATION        (AXIS2_START_ERROR + 4)
-
-
-/** @} */
-
-/** 
- * @addtogroup AXIS2 Status codes
- * @{
- */
-
-#define AXIS2_SUCCESS        (AXIS2_START_STATUS + 1)
-#define AXIS2_FAILURE       (AXIS2_START_STATUS + 2)
-
-
-/** @} */
-
-#endif /* AXIS2_ERRNO_H */

Modified: webservices/axis2/trunk/c/modules/common/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/Makefile.am?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.am Wed Oct 12 03:36:07 2005
@@ -1,7 +1,7 @@
 bin_PROGRAMS = common_test
 SUBDIRS =
 AM_CPPFLAGS = $(CPPFLAGS)
-common_test_SOURCES = common_test.c
+common_test_SOURCES = common_test.c main.c
 
 common_test_LDADD   =  $(LDFLAGS) ../src/libcommon.la -ldl
 INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include

Modified: webservices/axis2/trunk/c/modules/common/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/Makefile.in?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.in Wed Oct 12 03:36:07 2005
@@ -51,7 +51,7 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_common_test_OBJECTS = common_test.$(OBJEXT)
+am_common_test_OBJECTS = common_test.$(OBJEXT) main.$(OBJEXT)
 common_test_OBJECTS = $(am_common_test_OBJECTS)
 am__DEPENDENCIES_1 =
 common_test_DEPENDENCIES = $(am__DEPENDENCIES_1) ../src/libcommon.la
@@ -176,7 +176,7 @@
 target_alias = @target_alias@
 SUBDIRS = 
 AM_CPPFLAGS = $(CPPFLAGS)
-common_test_SOURCES = common_test.c
+common_test_SOURCES = common_test.c main.c
 common_test_LDADD = $(LDFLAGS) ../src/libcommon.la -ldl
 INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
 all: all-recursive
@@ -251,6 +251,7 @@
 	-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:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

Modified: webservices/axis2/trunk/c/modules/common/test/common_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/common_test.c?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/common_test.c (original)
+++ webservices/axis2/trunk/c/modules/common/test/common_test.c Wed Oct 12 03:36:07 2005
@@ -44,19 +44,4 @@
     return suite;
 }
 
-void RunAllTests(void) {
-    CuString *output = CuStringNew();
-    CuSuite* suite = CuSuiteNew();
 
-    CuSuiteAddSuite(suite, axis2_commonGetSuite());
-
-    CuSuiteRun(suite);
-    CuSuiteSummary(suite, output);
-    CuSuiteDetails(suite, output);
-    printf("%s\n", output->buffer);
-}
-
-int main(void) {
-    RunAllTests();
-    return 0;
-}

Modified: webservices/axis2/trunk/c/modules/common/test/main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/main.c?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/main.c (original)
+++ webservices/axis2/trunk/c/modules/common/test/main.c Wed Oct 12 03:36:07 2005
@@ -1,13 +1,18 @@
-#include <axis2_allocator.h>
-#include <axis2_environment.h>
+#include "common_test.h"
 
-int main()
-{
-    char buff[10];
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
-    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
-    axis2_stream_read(env->stream, buff, 10);
-    axis2_stream_write(env->stream, buff, 10);
-    axis2_log_write(env->log, buff, 10);
+void RunAllTests(void) {
+    CuString *output = CuStringNew();
+    CuSuite* suite = CuSuiteNew();
+
+    CuSuiteAddSuite(suite, axis2_commonGetSuite());
+
+    CuSuiteRun(suite);
+    CuSuiteSummary(suite, output);
+    CuSuiteDetails(suite, output);
+    printf("%s\n", output->buffer);
+}
+
+int main(void) {
+    RunAllTests();
     return 0;
 }

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Wed Oct 12 03:36:07 2005
@@ -1,9 +1,24 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 #include <axis2_description_param_include.h>
-#include <stdlib.h>
 
 static apr_pool_t *om_pool;
 
-void axis2_description_param_include_add_parameter
+int axis2_description_param_include_add_parameter
     (axis2_description_param_include_t *param_include,
      axis2_parameter_t * param);
 	 
@@ -18,7 +33,7 @@
 int axis2_description_param_include_is_parameter_locked
     (axis2_description_param_include_t *param_include, char *param_name);
 	 
-axis2_description_param_include_t *create_axis2_description_param_include ()
+axis2_description_param_include_t *axis2_description_param_include_create ()
 {
 	axis2_description_param_include_t *param_include = 
 		(axis2_description_param_include_t *)
@@ -53,33 +68,33 @@
 			}
 			else
 				fprintf(stderr, "*** error_code:%d, %s\n",
-					AXIS2_ERROR_OM_MEMORY_ALLOCATION,
-					"AXIS2_ERROR_OM_MEMORY_ALLOCATION");
+					AXIS2_ERROR_NO_MEMORY,
+					"AXIS2_ERROR_NO_MEMORY");
 		}else
 		{
 			fprintf(stderr, "*** error_code:%d, %s\n", 
-					AXIS2_ERROR_OM_MEMORY_ALLOCATION,
-			 		"AXIS2_ERROR_OM_MEMORY_ALLOCATION");
+					AXIS2_ERROR_NO_MEMORY,
+			 		"AXIS2_ERROR_NO_MEMORY");
 		}
 		
 	}
 	else
 		fprintf(stderr, "*** error_code:%d, %s\n", 
-			AXIS2_ERROR_OM_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_OM_MEMORY_ALLOCATION");
+			AXIS2_ERROR_NO_MEMORY
+			, "AXIS2_ERROR_NO_MEMORY");
 	
 	
 	return NULL;
 }
 
-void free_axis2_description_param_include (axis2_description_param_include_t
+int axis2_description_param_include_free (axis2_description_param_include_t
     *param_include)
 {
 	if(param_include)
 		free(param_include);
 }
 
-void axis2_description_param_include_add_parameter
+int axis2_description_param_include_add_parameter
     (axis2_description_param_include_t *param_include,
      axis2_parameter_t * param)
 {
@@ -97,8 +112,9 @@
 				APR_HASH_KEY_STRING, param);
 		}
 	}
-	fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_NULL_MEMORY_ACCESS
-		, "AXIS2_ERROR_NULL_MEMORY_ACCESS");
+	fprintf(stderr, "*** error_code:%d, %s\n"
+		, AXIS2_ERROR_INVALID_NULL_PARAMETER
+		, "AXIS2_ERROR_INVALID_NULL_PARAMETER");
 
 }
 

Modified: webservices/axis2/trunk/c/modules/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/Makefile.am?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/Makefile.am Wed Oct 12 03:36:07 2005
@@ -1 +1 @@
-SUBDIRS = om
+SUBDIRS = om common unit

Modified: webservices/axis2/trunk/c/modules/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/Makefile.in?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/Makefile.in Wed Oct 12 03:36:07 2005
@@ -152,7 +152,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = om
+SUBDIRS = om common unit
 all: all-recursive
 
 .SUFFIXES:

Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.in?rev=314839&r1=314838&r2=314839&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.in Wed Oct 12 03:36:07 2005
@@ -51,7 +51,7 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_test_om_OBJECTS = test_om_serialize.$(OBJEXT)
+am_test_om_OBJECTS = test_om.$(OBJEXT)
 test_om_OBJECTS = $(am_test_om_OBJECTS)
 am__DEPENDENCIES_1 =
 test_om_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -178,7 +178,7 @@
 target_alias = @target_alias@
 SUBDIRS = 
 AM_CPPFLAGS = $(CPPFLAGS)
-test_om_SOURCES = test_om_serialize.c
+test_om_SOURCES = test_om.c
 test_om_LDADD = $(LDFLAGS) ../../../xml/om/src/libom.la ../../../xml/guththila/src/libguththila.la -ldl
 INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../xml/guththila/src -I../../../../include
 all: all-recursive
@@ -252,7 +252,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_om_serialize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_om.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \