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/05/30 20:55:14 UTC
[lucy-commits] svn commit: r1129291 - in
/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test: TestDirManip.c
TestFuncMacro.c TestHeaders.c TestIntegers.c TestLargeFiles.c
TestUnusedVars.c TestVariadicMacros.c
Author: marvin
Date: Mon May 30 18:55:14 2011
New Revision: 1129291
URL: http://svn.apache.org/viewvc?rev=1129291&view=rev
Log:
Make Charmonizer tests more standalone.
Remove all references to AllTests.h in the Charmonizer test files. Change
functions to static, as these tests are now compiled as standalone executables
and do not need to publish interfaces.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c
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/TestDirManip.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c?rev=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c Mon May 30 18:55:14 2011
@@ -17,7 +17,6 @@
#define CHAZ_USE_SHORT_NAMES
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
#include <stdio.h>
#include <string.h>
#include "charmony.h"
@@ -37,13 +36,8 @@
#include <direct.h>
#endif
-TestBatch*
-TestDirManip_prepare() {
- return Test_new_batch("Integers", 6, TestDirManip_run);
-}
-
-void
-TestDirManip_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
TEST_INT_EQ(batch, 0, makedir("_chaz_test_dir", 0777), "makedir");
TEST_INT_EQ(batch, 0, makedir("_chaz_test_dir" DIR_SEP "deep", 0777),
"makedir with DIR_SEP");
@@ -74,7 +68,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestDirManip_prepare();
+ batch = Test_new_batch("Integers", 6, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c Mon May 30 18:55:14 2011
@@ -19,12 +19,6 @@
#include "charmony.h"
#include <string.h>
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
-
-TestBatch*
-TestFuncMacro_prepare() {
- return Test_new_batch("FuncMacro", 4, TestFuncMacro_run);
-}
#ifdef INLINE
static INLINE char* S_inline_function() {
@@ -32,25 +26,25 @@ static INLINE char* S_inline_function()
}
#endif
-void
-TestFuncMacro_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
#ifdef HAS_FUNC_MACRO
- TEST_STR_EQ(batch, FUNC_MACRO, "chaz_TestFuncMacro_run",
+ TEST_STR_EQ(batch, FUNC_MACRO, "S_run_tests",
"FUNC_MACRO");
#else
SKIP(batch, "no FUNC_MACRO");
#endif
#ifdef HAS_ISO_FUNC_MACRO
- TEST_STR_EQ(batch, __func__, "chaz_TestFuncMacro_run",
+ TEST_STR_EQ(batch, __func__, "S_run_tests",
"HAS_ISO_FUNC_MACRO");
#else
SKIP(batch, "no ISO_FUNC_MACRO");
#endif
#ifdef HAS_GNUC_FUNC_MACRO
- TEST_STR_EQ(batch, __FUNCTION__, "chaz_TestFuncMacro_run",
+ TEST_STR_EQ(batch, __FUNCTION__, "S_run_tests",
"HAS_GNUC_FUNC_MACRO");
#else
SKIP(batch, "no GNUC_FUNC_MACRO");
@@ -68,7 +62,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestFuncMacro_prepare();
+ batch = Test_new_batch("FuncMacro", 4, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c Mon May 30 18:55:14 2011
@@ -19,7 +19,6 @@
#include "charmony.h"
#include <string.h>
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
#ifdef HAS_ASSERT_H
#include <assert.h>
@@ -145,13 +144,8 @@
#include <utime.h>
#endif
-TestBatch*
-TestHeaders_prepare() {
- return Test_new_batch("Headers", 2, TestHeaders_run);
-}
-
-void
-TestHeaders_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
PASS(batch, "Compiled successfully with all detected headers");
/* Don't bother checking all -- just use stdio as an example. */
@@ -167,7 +161,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestHeaders_prepare();
+ batch = Test_new_batch("Headers", 2, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c Mon May 30 18:55:14 2011
@@ -17,7 +17,6 @@
#define CHAZ_USE_SHORT_NAMES
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
#include "charmony.h"
#include <stdio.h>
#include <string.h>
@@ -25,13 +24,8 @@
#include <inttypes.h>
#endif
-TestBatch*
-TestIntegers_prepare() {
- return Test_new_batch("Integers", 37, TestIntegers_run);
-}
-
-void
-TestIntegers_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
{
long one = 1;
long big_endian = !(*((char *)(&one)));
@@ -131,7 +125,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestIntegers_prepare();
+ batch = Test_new_batch("Integers", 37, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c Mon May 30 18:55:14 2011
@@ -24,15 +24,9 @@
#include <stdio.h>
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
-TestBatch*
-TestLargeFiles_prepare() {
- return Test_new_batch("LargeFiles", 10, TestLargeFiles_run);
-}
-
-void
-TestLargeFiles_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
FILE *fh;
off64_t offset;
int check_val;
@@ -103,7 +97,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestLargeFiles_prepare();
+ batch = Test_new_batch("LargeFiles", 10, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c Mon May 30 18:55:14 2011
@@ -18,14 +18,9 @@
#include "charmony.h"
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
-TestBatch*
-TestUnusedVars_prepare() {
- return Test_new_batch("UnusedVars", 2, TestUnusedVars_run);
-}
-void
-TestUnusedVars_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
#ifdef UNUSED_VAR
PASS(batch, "UNUSED_VAR macro is defined");
#else
@@ -42,7 +37,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestUnusedVars_prepare();
+ batch = Test_new_batch("UnusedVars", 2, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;
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=1129291&r1=1129290&r2=1129291&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c Mon May 30 18:55:14 2011
@@ -20,15 +20,9 @@
#include <string.h>
#include <stdio.h>
#include "Charmonizer/Test.h"
-#include "Charmonizer/Test/AllTests.h"
-TestBatch*
-TestVariadicMacros_prepare() {
- return Test_new_batch("VariadicMacros", 4, TestVariadicMacros_run);
-}
-
-void
-TestVariadicMacros_run(TestBatch *batch) {
+static void
+S_run_tests(TestBatch *batch) {
char buf[10];
chaz_bool_t really_has_var_macs = false;
@@ -71,7 +65,7 @@ int main(int argc, char **argv) {
TestBatch *batch;
Test_init();
- batch = TestVariadicMacros_prepare();
+ batch = Test_new_batch("VariadicMacros", 4, S_run_tests);
batch->run_test(batch);
batch->destroy(batch);
return 0;