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 2009/12/12 22:20:12 UTC
svn commit: r889980 - in /lucene/lucy/trunk:
charmonizer/src/Charmonizer/Test/ perl/lib/Lucy/
Author: marvin
Date: Sat Dec 12 21:20:10 2009
New Revision: 889980
URL: http://svn.apache.org/viewvc?rev=889980&view=rev
Log:
Change Charmonizer test module namespacing to reflect new filenames.
Modified:
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
lucene/lucy/trunk/perl/lib/Lucy/Test.pm
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c Sat Dec 12 21:20:10 2009
@@ -13,13 +13,13 @@
/* create a null-terminated array of test batches to iterate over */
batches = (TestBatch**)malloc(8 * sizeof(TestBatch*));
- batches[0] = TDirManip_prepare();
- batches[1] = TFuncMacro_prepare();
- batches[2] = THeaders_prepare();
- batches[3] = TIntegers_prepare();
- batches[4] = TLargeFiles_prepare();
- batches[5] = TUnusedVars_prepare();
- batches[6] = TVariadicMacros_prepare();
+ batches[0] = TestDirManip_prepare();
+ batches[1] = TestFuncMacro_prepare();
+ batches[2] = TestHeaders_prepare();
+ batches[3] = TestIntegers_prepare();
+ batches[4] = TestLargeFiles_prepare();
+ batches[5] = TestUnusedVars_prepare();
+ batches[6] = TestVariadicMacros_prepare();
batches[7] = NULL;
}
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h Sat Dec 12 21:20:10 2009
@@ -34,62 +34,62 @@
*/
chaz_TestBatch*
-chaz_TDirManip_prepare();
+chaz_TestDirManip_prepare();
chaz_TestBatch*
-chaz_TFuncMacro_prepare();
+chaz_TestFuncMacro_prepare();
chaz_TestBatch*
-chaz_THeaders_prepare();
+chaz_TestHeaders_prepare();
chaz_TestBatch*
-chaz_TIntegers_prepare();
+chaz_TestIntegers_prepare();
chaz_TestBatch*
-chaz_TLargeFiles_prepare();
+chaz_TestLargeFiles_prepare();
chaz_TestBatch*
-chaz_TUnusedVars_prepare();
+chaz_TestUnusedVars_prepare();
chaz_TestBatch*
-chaz_TVariadicMacros_prepare();
+chaz_TestVariadicMacros_prepare();
void
-chaz_TDirManip_run(chaz_TestBatch *batch);
+chaz_TestDirManip_run(chaz_TestBatch *batch);
void
-chaz_TFuncMacro_run(chaz_TestBatch *batch);
+chaz_TestFuncMacro_run(chaz_TestBatch *batch);
void
-chaz_THeaders_run(chaz_TestBatch *batch);
+chaz_TestHeaders_run(chaz_TestBatch *batch);
void
-chaz_TIntegers_run(chaz_TestBatch *batch);
+chaz_TestIntegers_run(chaz_TestBatch *batch);
void
-chaz_TLargeFiles_run(chaz_TestBatch *batch);
+chaz_TestLargeFiles_run(chaz_TestBatch *batch);
void
-chaz_TUnusedVars_run(chaz_TestBatch *batch);
+chaz_TestUnusedVars_run(chaz_TestBatch *batch);
void
-chaz_TVariadicMacros_run(chaz_TestBatch *batch);
+chaz_TestVariadicMacros_run(chaz_TestBatch *batch);
#ifdef CHAZ_USE_SHORT_NAMES
- #define TDirManip_prepare chaz_TDirManip_prepare
- #define TDirManip_run chaz_TDirManip_run
- #define TFuncMacro_prepare chaz_TFuncMacro_prepare
- #define THeaders_prepare chaz_THeaders_prepare
- #define TIntegers_prepare chaz_TIntegers_prepare
- #define TLargeFiles_prepare chaz_TLargeFiles_prepare
- #define TUnusedVars_prepare chaz_TUnusedVars_prepare
- #define TVariadicMacros_prepare chaz_TVariadicMacros_prepare
- #define TFuncMacro_run chaz_TFuncMacro_run
- #define THeaders_run chaz_THeaders_run
- #define TIntegers_run chaz_TIntegers_run
- #define TLargeFiles_run chaz_TLargeFiles_run
- #define TUnusedVars_run chaz_TUnusedVars_run
- #define TVariadicMacros_run chaz_TVariadicMacros_run
+ #define TestDirManip_prepare chaz_TestDirManip_prepare
+ #define TestDirManip_run chaz_TestDirManip_run
+ #define TestFuncMacro_prepare chaz_TestFuncMacro_prepare
+ #define TestHeaders_prepare chaz_TestHeaders_prepare
+ #define TestIntegers_prepare chaz_TestIntegers_prepare
+ #define TestLargeFiles_prepare chaz_TestLargeFiles_prepare
+ #define TestUnusedVars_prepare chaz_TestUnusedVars_prepare
+ #define TestVariadicMacros_prepare chaz_TestVariadicMacros_prepare
+ #define TestFuncMacro_run chaz_TestFuncMacro_run
+ #define TestHeaders_run chaz_TestHeaders_run
+ #define TestIntegers_run chaz_TestIntegers_run
+ #define TestLargeFiles_run chaz_TestLargeFiles_run
+ #define TestUnusedVars_run chaz_TestUnusedVars_run
+ #define TestVariadicMacros_run chaz_TestVariadicMacros_run
#endif
#ifdef __cplusplus
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestDirManip.c Sat Dec 12 21:20:10 2009
@@ -22,13 +22,13 @@
#endif
TestBatch*
-TDirManip_prepare()
+TestDirManip_prepare()
{
- return Test_new_batch("Integers", 6, TDirManip_run);
+ return Test_new_batch("Integers", 6, TestDirManip_run);
}
void
-TDirManip_run(TestBatch *batch)
+TestDirManip_run(TestBatch *batch)
{
ASSERT_INT_EQ(batch, 0, makedir("_chaz_test_dir", 0777), "makedir");
ASSERT_INT_EQ(batch, 0, makedir("_chaz_test_dir" DIR_SEP "deep", 0777),
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c Sat Dec 12 21:20:10 2009
@@ -6,9 +6,9 @@
#include "Charmonizer/Test/AllTests.h"
TestBatch*
-TFuncMacro_prepare()
+TestFuncMacro_prepare()
{
- return Test_new_batch("FuncMacro", 4, TFuncMacro_run);
+ return Test_new_batch("FuncMacro", 4, TestFuncMacro_run);
}
#ifdef INLINE
@@ -19,25 +19,25 @@
#endif
void
-TFuncMacro_run(TestBatch *batch)
+TestFuncMacro_run(TestBatch *batch)
{
#ifdef HAS_FUNC_MACRO
- ASSERT_STR_EQ(batch, FUNC_MACRO, "chaz_TFuncMacro_run",
+ ASSERT_STR_EQ(batch, FUNC_MACRO, "chaz_TestFuncMacro_run",
"FUNC_MACRO");
#else
SKIP(batch, "no FUNC_MACRO");
#endif
#ifdef HAS_ISO_FUNC_MACRO
- ASSERT_STR_EQ(batch, __func__, "chaz_TFuncMacro_run",
+ ASSERT_STR_EQ(batch, __func__, "chaz_TestFuncMacro_run",
"HAS_ISO_FUNC_MACRO");
#else
SKIP(batch, "no ISO_FUNC_MACRO");
#endif
#ifdef HAS_GNUC_FUNC_MACRO
- ASSERT_STR_EQ(batch, __FUNCTION__, "chaz_TFuncMacro_run",
+ ASSERT_STR_EQ(batch, __FUNCTION__, "chaz_TestFuncMacro_run",
"HAS_GNUC_FUNC_MACRO");
#else
SKIP(batch, "no GNUC_FUNC_MACRO");
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHeaders.c Sat Dec 12 21:20:10 2009
@@ -130,13 +130,13 @@
#endif
TestBatch*
-THeaders_prepare()
+TestHeaders_prepare()
{
- return Test_new_batch("Headers", 2, THeaders_run);
+ return Test_new_batch("Headers", 2, TestHeaders_run);
}
void
-THeaders_run(TestBatch *batch)
+TestHeaders_run(TestBatch *batch)
{
PASS(batch, "Compiled successfully with all detected headers");
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c Sat Dec 12 21:20:10 2009
@@ -10,13 +10,13 @@
#endif
TestBatch*
-TIntegers_prepare()
+TestIntegers_prepare()
{
- return Test_new_batch("Integers", 37, TIntegers_run);
+ return Test_new_batch("Integers", 37, TestIntegers_run);
}
void
-TIntegers_run(TestBatch *batch)
+TestIntegers_run(TestBatch *batch)
{
{
long one= 1;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestLargeFiles.c Sat Dec 12 21:20:10 2009
@@ -11,13 +11,13 @@
#include "Charmonizer/Test/AllTests.h"
TestBatch*
-TLargeFiles_prepare()
+TestLargeFiles_prepare()
{
- return Test_new_batch("LargeFiles", 10, TLargeFiles_run);
+ return Test_new_batch("LargeFiles", 10, TestLargeFiles_run);
}
void
-TLargeFiles_run(TestBatch *batch)
+TestLargeFiles_run(TestBatch *batch)
{
FILE *fh;
off64_t offset;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestUnusedVars.c Sat Dec 12 21:20:10 2009
@@ -5,12 +5,12 @@
#include "Charmonizer/Test/AllTests.h"
TestBatch*
-TUnusedVars_prepare()
+TestUnusedVars_prepare()
{
- return Test_new_batch("UnusedVars", 2, TUnusedVars_run);
+ return Test_new_batch("UnusedVars", 2, TestUnusedVars_run);
}
void
-TUnusedVars_run(TestBatch *batch)
+TestUnusedVars_run(TestBatch *batch)
{
#ifdef UNUSED_VAR
PASS(batch, "UNUSED_VAR macro is defined");
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c Sat Dec 12 21:20:10 2009
@@ -7,13 +7,13 @@
#include "Charmonizer/Test/AllTests.h"
TestBatch*
-TVariadicMacros_prepare()
+TestVariadicMacros_prepare()
{
- return Test_new_batch("VariadicMacros", 4, TVariadicMacros_run);
+ return Test_new_batch("VariadicMacros", 4, TestVariadicMacros_run);
}
void
-TVariadicMacros_run(TestBatch *batch)
+TestVariadicMacros_run(TestBatch *batch)
{
char buf[10];
chaz_bool_t really_has_var_macs = false;
Modified: lucene/lucy/trunk/perl/lib/Lucy/Test.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Test.pm?rev=889980&r1=889979&r2=889980&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Test.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Test.pm Sat Dec 12 21:20:10 2009
@@ -114,25 +114,25 @@
chaz_Test_init();
if (strcmp(which, "dirmanip") == 0) {
- batch = chaz_TDirManip_prepare();
+ batch = chaz_TestDirManip_prepare();
}
else if (strcmp(which, "integers") == 0) {
- batch = chaz_TIntegers_prepare();
+ batch = chaz_TestIntegers_prepare();
}
else if (strcmp(which, "func_macro") == 0) {
- batch = chaz_TFuncMacro_prepare();
+ batch = chaz_TestFuncMacro_prepare();
}
else if (strcmp(which, "headers") == 0) {
- batch = chaz_THeaders_prepare();
+ batch = chaz_TestHeaders_prepare();
}
else if (strcmp(which, "large_files") == 0) {
- batch = chaz_TLargeFiles_prepare();
+ batch = chaz_TestLargeFiles_prepare();
}
else if (strcmp(which, "unused_vars") == 0) {
- batch = chaz_TUnusedVars_prepare();
+ batch = chaz_TestUnusedVars_prepare();
}
else if (strcmp(which, "variadic_macros") == 0) {
- batch = chaz_TVariadicMacros_prepare();
+ batch = chaz_TestVariadicMacros_prepare();
}
else {
THROW(LUCY_ERR, "Unknown test identifier: '%s'", which);