failAssert.h came not to generated automatically, and

suiteAssert.c came to be formed automatically.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2690395..75b4f63 100755 (executable)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ check_PROGRAMS = runSuccess runFailure
 runSuccess_SOURCES = runSuccess.c $(TESTSRCS)
 runFailure_SOURCES = runFailure.c $(FAILSRCS)
 nodist_runSuccess_SOURCES = suiteSuccess.c 
-nodist_runFailure_SOURCES = failAssert.h
+nodist_runFailure_SOURCES = suiteAssert.c
 runSuccess_DEPENDENCIES = $(top_srcdir)/src/ccunit/libccunit.la
 runFailure_DEPENDENCIES = $(top_srcdir)/src/ccunit/libccunit.la
 
@@ -57,5 +57,5 @@ MAKESUITE = PATH="$(top_srcdir)/src/tools:$$PATH" ccunit_makeSuite
 suiteSuccess.c: $(TESTSRCS) $(top_srcdir)/src/tools/ccunit_makeSuite
        $(MAKESUITE) -o $@ $(TESTSRCS)
 
-failAssert.h: failAssert.c $(top_srcdir)/src/tools/ccunit_makeSuite
-       $(MAKESUITE) -o $@ -f failAssert_suite failAssert.c
+suiteAssert.c: $(FAILSRCS) $(top_srcdir)/src/tools/ccunit_makeSuite
+       $(MAKESUITE) -o $@ -f failAssert_suite $(FAILSRCS)

diff --git a/tests/failAssert.c b/tests/failAssert.c
index 653feb5..fdc6a61 100644 (file)
--- a/tests/failAssert.c
+++ b/tests/failAssert.c
@@ -24,14 +24,12 @@
 #include <limits.h>
 #include <ccunit/CCUnitAssert.h>
 
-#include "failAssert.h"
-
 /** test case: assert macro test */
 
 /**
  * assert fail.
  */
-static void test_assert_fail ()
+void test_assert_fail ()
 {
   CCUNIT_ASSERT (1 == 0);
 }
@@ -39,7 +37,7 @@ static void test_assert_fail ()
 /**
  * assert eq int fail.
  */
-static void test_assertInt_equal ()
+void test_assertInt_equal ()
 {
   CCUNIT_ASSERT_EQ_INT (INT_MAX, INT_MIN);
 }
@@ -47,7 +45,7 @@ static void test_assertInt_equal ()
 /**
  * assert !eq int fail
  */
-static void test_assertInt_notEqual ()
+void test_assertInt_notEqual ()
 {
   CCUNIT_ASSERT_NE_INT (INT_MAX, INT_MAX);
 }
@@ -55,7 +53,7 @@ static void test_assertInt_notEqual ()
 /**
  * assert int compare fail
  */
-static void test_assertInt_comp_fail ()
+void test_assertInt_comp_fail ()
 {
   CCUNIT_ASSERT_GT_INT (INT_MIN, INT_MAX);
 }
@@ -63,7 +61,7 @@ static void test_assertInt_comp_fail ()
 /**
  * assert str compare fail
  */
-static void test_assertStr_comp_fail ()
+void test_assertStr_comp_fail ()
 {
   CCUNIT_ASSERT_EQ_STR ("string", "STRING");
 }
@@ -72,18 +70,18 @@ static void test_assertStr_comp_fail ()
 
 /** test case: assert setUp() */
 
-static void setUp_setUp ()
+void setUp_setUp ()
 {
   CCUNIT_ASSERT_EQ_STR ("setUp", "");
 }
 
-static void tearDown_setUp ()
+void tearDown_setUp ()
 {
   CCUNIT_ASSERT (false);
 }
 
 /** not reached */
-static void test_setUp ()
+void test_setUp ()
 {
   CCUNIT_ASSERT(false);
 }
@@ -92,13 +90,13 @@ static void test_setUp ()
 
 /** test case: assert tearDown() */
 
-static void tearDown_tearDown ()
+void tearDown_tearDown ()
 {
   CCUNIT_ASSERT_EQ_STR ("tearDown", "");
 }
 
 /** be failed */
-static void test_tearUp ()
+void test_tearUp ()
 {
   CCUNIT_ASSERT(false);
 }
@@ -106,30 +104,30 @@ static void test_tearUp ()
 /** end test case */
 
 /** test case: assert in setup_setUp () */
-static void setup_setUp_test_setup_setUp ()
+void setup_setUp_test_setup_setUp ()
 {
   CCUNIT_ASSERT(false);
 }
 
 /** not reached */
-static void setUp_test_setup_setUp ()
+void setUp_test_setup_setUp ()
 {
   CCUNIT_ASSERT(false);
 }
 
 /** not reached */
-static void tearDown_test_setup_setUp ()
+void tearDown_test_setup_setUp ()
 {
   CCUNIT_ASSERT(false);
 }
 
 /** not reached */
-static void test_test_setup_setUp ()
+void test_test_setup_setUp ()
 {
   CCUNIT_ASSERT(false);
 }
 
-static void setup_tearDown_test_setup_setUp ()
+void setup_tearDown_test_setup_setUp ()
 {
   CCUNIT_ASSERT(false);
 }