New upstream version 2.4.0upstream/2.4.0

3 files changed, 30 insertions, 22 deletions

diff --git a/tests/unit_tests/example_test/Makefile.in b/tests/unit_tests/example_test/Makefile.in
index 6ac7504..ff4f6c4 100644
--- a/tests/unit_tests/example_test/Makefile.in
+++ b/tests/unit_tests/example_test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -446,14 +446,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/tests/unit_tests/example_test/test.c b/tests/unit_tests/example_test/test.c
index 9986898..d48e5f5 100644
--- a/tests/unit_tests/example_test/test.c
+++ b/tests/unit_tests/example_test/test.c
@@ -6,40 +6,46 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-static int setup(void **state) {
-     int *answer  = malloc(sizeof(int));
+static int
+setup(void **state) {
+    int *answer  = malloc(sizeof(int));
 
-     *answer=42;
-     *state=answer;
+    *answer = 42;
+    *state = answer;
 
-     return 0;
+    return 0;
 }
 
-static int teardown(void **state) {
-     free(*state);
+static int
+teardown(void **state) {
+    free(*state);
 
-     return 0;
+    return 0;
 }
 
-static void null_test_success(void **state) {
+static void
+null_test_success(void **state) {
     (void) state;
 }
 
-static void int_test_success(void **state) {
-     int *answer = *state;
-     assert_int_equal(*answer, 42);
+static void
+int_test_success(void **state) {
+    int *answer = *state;
+    assert_int_equal(*answer, 42);
 }
 
-static void failing_test(void **state) {
-     // This tests fails to test that make check fails
-     assert_int_equal(0, 42);
+static void
+failing_test(void **state) {
+    /* This tests fails to test that make check fails */
+    assert_int_equal(0, 42);
 }
 
-int main(void) {
+int
+main(void) {
     const struct CMUnitTest tests[] = {
         cmocka_unit_test(null_test_success),
         cmocka_unit_test_setup_teardown(int_test_success, setup, teardown),
-//        cmocka_unit_test(failing_test),
+/*        cmocka_unit_test(failing_test), */
     };
 
     return cmocka_run_group_tests_name("success_test", tests, NULL, NULL);
diff --git a/tests/unit_tests/example_test/test2.c b/tests/unit_tests/example_test/test2.c
index f99da9e..b5d4fa6 100644
--- a/tests/unit_tests/example_test/test2.c
+++ b/tests/unit_tests/example_test/test2.c
@@ -7,12 +7,14 @@
 #include <cmocka.h>
 
 
-static void test_true(void **state) {
+static void
+test_true(void **state) {
     (void) state;
 }
 
 
-int main(void) {
+int
+main(void) {
     const struct CMUnitTest tests[] = {
         cmocka_unit_test(test_true),
     };