[cutter-commit 04195] clear-code/cutter [master] clang test: require return value and "(gconstpointer)" for function name

[<nul...@cl...>]

Kouhei Sutou	2012-03-27 00:24:44 +0900 (Tue, 27 Mar 2012)

  New Revision: 169491b2810528d0b0df8ecea05067236a81e6a0

  Log:
    clang test: require return value and "(gconstpointer)" for function name
    
    "void XXX(gconstpointer)"

  Modified files:
    test/cutter/test-cut-test-iterator.c

  Modified: test/cutter/test-cut-test-iterator.c (+18 -7)
===================================================================
--- test/cutter/test-cut-test-iterator.c    2012-03-27 00:21:26 +0900 (2e3f3b9)
+++ test/cutter/test-cut-test-iterator.c    2012-03-27 00:24:44 +0900 (53c0c2e)
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- *  Copyright (C) 2008-2009  Kouhei Sutou <ko...@cl...>
+ *  Copyright (C) 2008-2012  Kouhei Sutou <ko...@cl...>
  *
  *  This library is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -57,6 +57,11 @@ static gint fail_line;
 } while (0)
 
 #define FAIL_LOCATION (cut_take_printf("%s:%d", __FILE__, fail_line))
+#ifdef __clang__
+#  define FUNCTION(name) "void " name "(gconstpointer)"
+#else
+#  define FUNCTION(name) name
+#endif
 
 
 static void
@@ -373,7 +378,8 @@ test_failure (void)
                            NULL,
                            "<2 == GPOINTER_TO_INT(data)>",
                            "2", "1",
-                           FAIL_LOCATION, "stub_failure_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_failure_iterated_test"),
                            NULL);
     cut_assert_test_result(run_context, 1, CUT_TEST_RESULT_SUCCESS,
                            "failure test iterator (Second)",
@@ -386,7 +392,8 @@ test_failure (void)
                            NULL,
                            "<2 == GPOINTER_TO_INT(data)>",
                            "2", "3",
-                           FAIL_LOCATION, "stub_failure_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_failure_iterated_test"),
                            NULL);
 }
 
@@ -425,7 +432,8 @@ test_error (void)
                            "ERROR!",
                            NULL,
                            NULL, NULL,
-                           FAIL_LOCATION, "stub_error_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_error_iterated_test"),
                            NULL);
     cut_assert_test_result(run_context, 2, CUT_TEST_RESULT_SUCCESS,
                            "error test iterator (Third)",
@@ -470,7 +478,8 @@ test_pending (void)
                            "PENDING!",
                            NULL,
                            NULL, NULL,
-                           FAIL_LOCATION, "stub_pending_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_pending_iterated_test"),
                            NULL);
     cut_assert_test_result(run_context, 2, CUT_TEST_RESULT_SUCCESS,
                            "pending test iterator (Third)",
@@ -515,7 +524,8 @@ test_notification (void)
                            "NOTIFICATION!",
                            NULL,
                            NULL, NULL,
-                           FAIL_LOCATION, "stub_notification_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_notification_iterated_test"),
                            NULL);
     cut_assert_test_result(run_context, 2, CUT_TEST_RESULT_SUCCESS,
                            "notification test iterator (Second)",
@@ -566,7 +576,8 @@ test_omission (void)
                            "OMISSION!",
                            NULL,
                            NULL, NULL,
-                           FAIL_LOCATION, "stub_omission_iterated_test",
+                           FAIL_LOCATION,
+                           FUNCTION("stub_omission_iterated_test"),
                            NULL);
     cut_assert_test_result(run_context, 2, CUT_TEST_RESULT_SUCCESS,
                            "omission test iterator (Second)",