diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | mysql-test/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 655cea20bc5..4012ee96751 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1313,6 +1313,7 @@ mysql-test/*.ds? mysql-test/*.vcproj mysql-test/.DS_Store mysql-test/collections/default.release +mysql-test/collections/default.release.done mysql-test/funcs_1.log mysql-test/funcs_1.tar mysql-test/gmon.out @@ -3066,4 +3067,5 @@ info_macros.cmake Docs/INFO_BIN Docs/INFO_SRC Testing +FilesCopied source_downloads diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index f360ef1c616..9c6db7082dc 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,8 +150,10 @@ ENDMACRO() FILE(GLOB infiles "collections/*.in") FOREACH(collin ${infiles}) STRING(REPLACE ".in" "" collection ${collin}) + STRING(REPLACE ".in" ".done" colldone ${collin}) # Only generate file once - IF(NOT EXISTS ${collection}) + IF(NOT EXISTS ${colldone}) PROCESS_COLLECTION_INCLUDE(${collin} ${collection}) + FILE(APPEND ${colldone} "${collin}\n") ENDIF() ENDFOREACH() |