Skip to content

Commit

Permalink
silenced tokudb.data warning if being built as a component Tokutek/mo…
Browse files Browse the repository at this point in the history
  • Loading branch information
leifwalsh committed Dec 24, 2013
1 parent 2d911e5 commit 46804fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake_modules/TokuSetupCTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(TOKUDB_DATA "${TokuDB_SOURCE_DIR}/../tokudb.data" CACHE FILEPATH "Path to da

if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS)
set(WARNED_ABOUT_DATA 0)
if (NOT EXISTS "${TOKUDB_DATA}/" AND NOT WARNED_ABOUT_DATA)
if (NOT EXISTS "${TOKUDB_DATA}/" AND NOT WARNED_ABOUT_DATA AND CMAKE_PROJECT_NAME STREQUAL TokuDB)
message(WARNING "Test data files are missing from ${TOKUDB_DATA}, which will cause some tests to fail. Please put them there or modify TOKUDB_DATA to avoid this.")
set(WARNED_ABOUT_DATA 1)
endif ()
Expand Down
6 changes: 3 additions & 3 deletions src/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)

foreach(oldver 4.2.0 5.0.8 5.2.7 6.0.0 6.1.0 6.5.1 6.6.3)
set(versiondir ${TOKUDB_DATA}/old-stress-test-envs/${oldver})
if (NOT EXISTS "${versiondir}/" AND NOT WARNED_ABOUT_DATA)
if (NOT EXISTS "${versiondir}/" AND NOT WARNED_ABOUT_DATA AND CMAKE_PROJECT_NAME STREQUAL TokuDB)
message(WARNING "Test data for upgrade tests for version ${oldver} doesn't exist, check out ${versiondir}/*-2000-dir first or upgrade stress tests may fail.")
set(WARNED_ABOUT_DATA 1)
endif ()
Expand Down Expand Up @@ -614,7 +614,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
endif ()
endforeach(src)

if (NOT EXISTS "${TOKUDB_DATA}/test_5902/" AND NOT WARNED_ABOUT_DATA)
if (NOT EXISTS "${TOKUDB_DATA}/test_5902/" AND NOT WARNED_ABOUT_DATA AND CMAKE_PROJECT_NAME STREQUAL TokuDB)
message(WARNING "Test data for dump-env.tdb doesn't exist, check out ${TOKUDB_DATA}/test_5902 first or dump-env.tdb may fail.")
set(WARNED_ABOUT_DATA 1)
endif ()
Expand Down Expand Up @@ -655,7 +655,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
endforeach(num)

set(old_loader_upgrade_data "${TOKUDB_DATA}/env_preload.4.2.0.emptydictionaries.cleanshutdown")
if (NOT EXISTS "${old_loader_upgrade_data}/" AND NOT WARNED_ABOUT_DATA)
if (NOT EXISTS "${old_loader_upgrade_data}/" AND NOT WARNED_ABOUT_DATA AND CMAKE_PROJECT_NAME STREQUAL TokuDB)
message(WARNING "Test data for loader upgrade tests doesn't exist, check out ${old_loader_upgrade_data} first, or loader-stress-test3.tdb may fail.")
set(WARNED_ABOUT_DATA 1)
endif ()
Expand Down

0 comments on commit 46804fa

Please sign in to comment.