You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/12/10 22:22:31 UTC
[lucy-commits] svn commit: r1212881 - in /incubator/lucy/trunk/charmonizer/src/Charmonizer:
Test.h Test/TestFuncMacro.c Test/TestHeaders.c Test/TestIntegers.c
Test/TestLargeFiles.c Test/TestUnusedVars.c Test/TestVariadicMacros.c
Author: marvin
Date: Sat Dec 10 21:22:30 2011
New Revision: 1212881
URL: http://svn.apache.org/viewvc?rev=1212881&view=rev
Log:
Remove TestBatch arg to PASS and FAIL.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h Sat Dec 10 21:22:30 2011
@@ -82,8 +82,6 @@ chaz_Test_new_batch(const char *batch_na
*/
#define CHAZ_TEST_PLAN chaz_Test_plan
#define CHAZ_TEST_TEST_STR_EQ chaz_Test_test_str_eq
-#define CHAZ_TEST_PASS chaz_Test_pass
-#define CHAZ_TEST_FAIL chaz_Test_fail
#define CHAZ_TEST_TEST_INT_EQ chaz_Test_test_int_eq
#define CHAZ_TEST_TEST_FLOAT_EQ chaz_Test_test_float_eq
@@ -115,9 +113,13 @@ void
chaz_Test_str_eq(chaz_TestBatch *batch, const char *got,
const char *expected, const char *message);
+#define CHAZ_TEST_PASS(_message) \
+ chaz_Test_pass(chaz_Test_current, (_message))
void
chaz_Test_pass(chaz_TestBatch *batch, const char *message);
+#define CHAZ_TEST_FAIL(_message) \
+ chaz_Test_fail(chaz_Test_current, (_message))
void
chaz_Test_fail(chaz_TestBatch *batch, const char *message);
@@ -144,6 +146,8 @@ extern chaz_TestBatch *chaz_Test_current
#define Test_finish chaz_Test_finish
#define OK CHAZ_TEST_OK
#define STR_EQ CHAZ_TEST_STR_EQ
+ #define PASS CHAZ_TEST_PASS
+ #define FAIL CHAZ_TEST_FAIL
#define TestBatch_destroy_t chaz_TestBatch_destroy_t
#define TestBatch_test_func_t chaz_TestBatch_test_func_t
#define TestBatch_run_test_t chaz_TestBatch_run_test_t
@@ -154,9 +158,7 @@ extern chaz_TestBatch *chaz_Test_current
#define PLAN CHAZ_TEST_PLAN
#define Test_str_eq chaz_Test_str_eq
#define Test_pass chaz_Test_pass
- #define PASS CHAZ_TEST_PASS
#define Test_fail chaz_Test_fail
- #define FAIL CHAZ_TEST_FAIL
#define Test_test_int_eq chaz_Test_test_int_eq
#define TEST_INT_EQ CHAZ_TEST_TEST_INT_EQ
#define Test_test_float_eq chaz_Test_test_float_eq
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c Sat Dec 10 21:22:30 2011
@@ -48,7 +48,7 @@ S_run_tests(TestBatch *batch) {
#endif
#ifdef INLINE
- PASS(batch, S_inline_function());
+ PASS(S_inline_function());
#else
SKIP(batch, "no INLINE functions");
#endif
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c Sat Dec 10 21:22:30 2011
@@ -146,13 +146,13 @@
static void
S_run_tests(TestBatch *batch) {
- PASS(batch, "Compiled successfully with all detected headers");
+ PASS("Compiled successfully with all detected headers");
/* Don't bother checking all -- just use stdio as an example. */
#ifdef HAS_STDIO_H
- PASS(batch, "stdio.h should have been detected");
+ PASS("stdio.h should have been detected");
#else
- FAIL(batch, "stdio.h should have been detected");
+ FAIL("stdio.h should have been detected");
#endif
}
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c Sat Dec 10 21:22:30 2011
@@ -35,7 +35,7 @@ S_run_tests(TestBatch *batch) {
#if defined(LITTLE_END)
OK(!big_endian, "LITTLE_END");
#else
- FAIL(batch, "Either BIG_END or LITTLE_END should be defined");
+ FAIL("Either BIG_END or LITTLE_END should be defined");
#endif
#endif
}
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c Sat Dec 10 21:22:30 2011
@@ -141,7 +141,7 @@ S_run_tests(TestBatch *batch) {
fd = open("_charm_large_file_test",
O_RDWR | O_CREAT | LARGEFILE_OPEN_FLAG, 0666);
if (fd == -1) {
- FAIL(batch, "open failed");
+ FAIL("open failed");
SKIP_REMAINING(batch, "open failed");
}
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c Sat Dec 10 21:22:30 2011
@@ -22,15 +22,15 @@
static void
S_run_tests(TestBatch *batch) {
#ifdef UNUSED_VAR
- PASS(batch, "UNUSED_VAR macro is defined");
+ PASS("UNUSED_VAR macro is defined");
#else
- FAIL(batch, "UNUSED_VAR macro is defined");
+ FAIL("UNUSED_VAR macro is defined");
#endif
#ifdef UNREACHABLE_RETURN
- PASS(batch, "UNREACHABLE_RETURN macro is defined");
+ PASS("UNREACHABLE_RETURN macro is defined");
#else
- FAIL(batch, "UNREACHABLE_RETURN macro is defined");
+ FAIL("UNREACHABLE_RETURN macro is defined");
#endif
}
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c?rev=1212881&r1=1212880&r2=1212881&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c Sat Dec 10 21:22:30 2011
@@ -28,9 +28,9 @@ S_run_tests(TestBatch *batch) {
#if defined(HAS_ISO_VARIADIC_MACROS) || defined(HAS_GNUC_VARIADIC_MACROS)
#ifdef HAS_VARIADIC_MACROS
- PASS(batch, "#defines agree");
+ PASS("#defines agree");
#else
- FAIL(batch, 0, "#defines agree");
+ FAIL(0, "#defines agree");
#endif
#else
SKIP_REMAINING(batch, "No variadic macro support");