• R/O
  • SSH
  • HTTPS

autest: Commit


Commit MetaInfo

Revision5 (tree)
Zeit2013-02-19 18:38:51
Autorsrz_zumix

Log Message

RunAll で実行するように修正

Ändern Zusammenfassung

Diff

--- trunk/toolchain/include/autest.h (revision 4)
+++ trunk/toolchain/include/autest.h (revision 5)
@@ -20,34 +20,36 @@
2020 #include "autest_pp.h"
2121
2222 /**
23+ * @private
24+ * @{
25+*/
26+#define AUTEST_TEST_FUNCNAME_(testcase_, testname_) AUTEST_PP_CAT(AUTEST_PP_CAT(testcase_, _), testname_)
27+/**
28+ * @}
29+*/
30+
31+
32+/**
2333 * @brief テストマクロ
2434 * @{
2535 */
2636
27-#if 0
37+#if 1
2838
2939 #define AUTEST_TEST(testcase_, testname_) __sharp__OnAutoItStartRegister \
3040 AUTEST_PP_TOSTRING( AUTEST_PP_CAT(testcase_, testname_)_AddTestCase ) \
3141 __lf__Func AUTEST_PP_CAT(AUTEST_PP_CAT(testcase_, testname_),_AddTestCase()) \
32- __lf__ Autest_AddTestCase(#testcase_) \
42+ __lf__ Autest_AddTest(#testcase_, #testname_) \
3343 __lf__EndFunc \
34- __lf__Func AUTEST_PP_CAT(testcase_, testname_)() \
35- __lf__ ConsoleWrite("[ RUN ] ") \
36- __lf__ ConsoleWrite(#testcase_) \
37- __lf__ ConsoleWrite(".") \
38- __lf__ ConsoleWrite(#testname_) \
39- __lf__ ConsoleWrite(@CRLF) \
44+ __lf__Func AUTEST_TEST_FUNCNAME_(testcase_, testname_)() \
45+ __lf__ Autest_OnTestStart(#testcase_, #testname_) \
4046
4147 #else
4248
4349 #define AUTEST_TEST(testcase_, testname_) __sharp__OnAutoItStartRegister \
44- AUTEST_PP_TOSTRING( AUTEST_PP_CAT(testcase_, testname_) ) \
45- __lf__Func AUTEST_PP_CAT(testcase_, testname_)() \
46- __lf__ ConsoleWrite("[ RUN ] ") \
47- __lf__ ConsoleWrite(#testcase_) \
48- __lf__ ConsoleWrite(".") \
49- __lf__ ConsoleWrite(#testname_) \
50- __lf__ ConsoleWrite(@CRLF) \
50+ AUTEST_PP_TOSTRING( AUTEST_TEST_FUNCNAME_(testcase_, testname_) ) \
51+ __lf__Func AUTEST_TEST_FUNCNAME_(testcase_, testname_)() \
52+ __lf__ Autest_OnTestStart(#testcase_, #testname_) \
5153
5254 #endif
5355
Show on old repository browser