From: <ust...@us...> - 2008-06-30 14:02:50
|
Revision: 2698 http://clucene.svn.sourceforge.net/clucene/?rev=2698&view=rev Author: ustramooner Date: 2008-06-30 07:02:43 -0700 (Mon, 30 Jun 2008) Log Message: ----------- have tests look for test data in ../../test/data also Modified Paths: -------------- branches/lucene2_3_2/test/test.h branches/lucene2_3_2/test/testall.cpp Modified: branches/lucene2_3_2/test/test.h =================================================================== --- branches/lucene2_3_2/test/test.h 2008-06-30 10:31:39 UTC (rev 2697) +++ branches/lucene2_3_2/test/test.h 2008-06-30 14:02:43 UTC (rev 2698) @@ -12,9 +12,9 @@ #include "CLucene/store/RAMDirectory.h" #include "CLucene/store/Lock.h" #include "CLucene/config/repl_wchar.h" -#include "CLucene/index/TermVector.h" -#ifdef HAVE_WINDOWS_H - #include <windows.h> +#include "CLucene/index/TermVector.h" +#ifdef HAVE_WINDOWS_H + #include <windows.h> #endif @@ -59,6 +59,7 @@ #define CLUCENE_DATA_LOCATION1 "../test/data/" #define CLUCENE_DATA_LOCATION2 "./test/data/" +#define CLUCENE_DATA_LOCATION3 "../../test/data/" #define CLUCENE_DATA_LOCATIONENV "srcdir" extern const char* cl_tempDir; Modified: branches/lucene2_3_2/test/testall.cpp =================================================================== --- branches/lucene2_3_2/test/testall.cpp 2008-06-30 10:31:39 UTC (rev 2697) +++ branches/lucene2_3_2/test/testall.cpp 2008-06-30 14:02:43 UTC (rev 2698) @@ -14,13 +14,13 @@ #include <crtdbg.h> #endif #endif - -#ifdef _CL_HAVE_FCNTL_H - #include <fcntl.h> -#endif -#ifdef _CL_HAVE_DIRECT_H - #include <direct.h> + +#ifdef _CL_HAVE_FCNTL_H + #include <fcntl.h> #endif +#ifdef _CL_HAVE_DIRECT_H + #include <direct.h> +#endif const char* cl_tempDir; bool cl_quiet; @@ -64,6 +64,8 @@ strcpy(clucene_data_location, CLUCENE_DATA_LOCATION1); else if ( CL_NS(util)::Misc::dir_Exists(CLUCENE_DATA_LOCATION2 "/reuters-21578-index/segments") ) strcpy(clucene_data_location, CLUCENE_DATA_LOCATION2); + else if ( CL_NS(util)::Misc::dir_Exists(CLUCENE_DATA_LOCATION3 "/reuters-21578-index/segments") ) + strcpy(clucene_data_location, CLUCENE_DATA_LOCATION3); else if ( getenv(CLUCENE_DATA_LOCATIONENV) != NULL ){ strcpy(clucene_data_location,getenv(CLUCENE_DATA_LOCATIONENV)); strcat(clucene_data_location,"/data/reuters-21578-index/segments"); @@ -78,7 +80,7 @@ //todo: make this configurable if ( !*clucene_data_location ){ fprintf(stderr,"%s must be run from a subdirectory of the application's root directory\n",argv[0]); - fprintf(stderr,"ensure that the test data exists in %s or %s\n",CLUCENE_DATA_LOCATION1, CLUCENE_DATA_LOCATION2); + fprintf(stderr,"ensure that the test data exists in %s or %s or %s\n",CLUCENE_DATA_LOCATION1, CLUCENE_DATA_LOCATION2, CLUCENE_DATA_LOCATION3); if ( getenv(CLUCENE_DATA_LOCATIONENV) != NULL ) fprintf(stderr,"%s/data was also checked because of the " CLUCENE_DATA_LOCATIONENV " environment variable", getenv(CLUCENE_DATA_LOCATIONENV)); ret_result = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |