Merge pull request #7718 from Michael-Gardner/hpcc-13525

HPCC-13525 Added whitelist file patterns for testing directory

Reviewed-By: Attila Vamos <attila.vamos@lexisnexis.com>
Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

testing/CMakeLists.txt

@@ -17,6 +17,8 @@ HPCC_ADD_SUBDIRECTORY (unittests)
 HPCC_ADD_SUBDIRECTORY (regress)
 install( DIRECTORY regress DESTINATION "./testing" COMPONENT Runtime
          USE_SOURCE_PERMISSIONS
-         PATTERN regress/ecl EXCLUDE
-         PATTERN regress/environment.xml.in EXCLUDE
-         PATTERN regress/CMakeLists.txt EXCLUDE )
+         FILES_MATCHING
+         PATTERN "regress/ecl-test"
+         PATTERN "regress/ecl-test.json"
+         PATTERN "regress/environment.xml"
+         PATTERN "regress/README.rst" )

testing/regress/CMakeLists.txt

@@ -14,6 +14,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 ################################################################################
+HPCC_ADD_SUBDIRECTORY (hpcc)
+HPCC_ADD_SUBDIRECTORY (ecl)
+
 configure_file("environment.xml.in" "environment.xml")
 
 Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.xml DESTINATION "./testing/regress" COMPONENT Runtime )
+
+Install ( DIRECTORY download hpcc ecl DESTINATION "./testing/regress" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          FILES_MATCHING
+          PATTERN "hpcc/__init__.py"
+          PATTERN "download/0drvb10.txt"
+          PATTERN "download/donQuixote.txt"
+          PATTERN "download/pge0112.txt"
+          PATTERN "download/spray_test.txt"
+          PATTERN "ecl/*.ecl"
+          PATTERN "ecl/*.xml"
+          PATTERN "ecl/*.queryxml" )

testing/regress/ecl/CMakeLists.txt

@@ -0,0 +1,28 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    All rights reserved. This program is free software: you can redistribute it
+#    and/or modify
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+HPCC_ADD_SUBDIRECTORY (setup)
+
+Install ( DIRECTORY setup common hthor key roxie thor DESTINATION "./testing/regress/ecl" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          FILES_MATCHING
+          PATTERN "setup/*.ecl"
+          PATTERN "setup/*.xml"
+          PATTERN "common/*.ecl"
+          PATTERN "hthor/*.xml"
+          PATTERN "key/*.xml"
+          PATTERN "roxie/*.xml"
+          PATTERN "thor/*.xml" )

testing/regress/ecl/setup/CMakeLists.txt

@@ -0,0 +1,20 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    All rights reserved. This program is free software: you can redistribute it
+#    and/or modify
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+Install ( DIRECTORY thor DESTINATION "./testing/regress/ecl/setup" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          FILES_MATCHING
+          PATTERN "thor/*.xml" )

testing/regress/hpcc/CMakeLists.txt

@@ -0,0 +1,37 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    All rights reserved. This program is free software: you can redistribute it
+#    and/or modify
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+HPCC_ADD_SUBDIRECTORY (util)
+Install ( DIRECTORY common regression util DESTINATION "./testing/regress/hpcc" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          FILES_MATCHING
+          PATTERN "common/config.py"
+          PATTERN "common/dict.py"
+          PATTERN "common/error.py"
+          PATTERN "common/__init__.py"
+          PATTERN "common/logger.py"
+          PATTERN "common/report.py"
+          PATTERN "common/shell.py"
+          PATTERN "regression/__init__.py"
+          PATTERN "regression/regress.py"
+          PATTERN "regression/suite.py"
+          PATTERN "util/argparse.py"
+          PATTERN "util/collections.py"
+          PATTERN "util/configgen.py"
+          PATTERN "util/expandcheck.py"
+          PATTERN "util/__init__.py"
+          PATTERN "util/util.py"
+)

testing/regress/hpcc/util/CMakeLists.txt

@@ -0,0 +1,24 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    All rights reserved. This program is free software: you can redistribute it
+#    and/or modify
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+Install ( DIRECTORY ecl DESTINATION "./testing/regress/hpcc/util" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          FILES_MATCHING
+          PATTERN "ecl/cc.py"
+          PATTERN "ecl/command.py"
+          PATTERN "ecl/file.py"
+          PATTERN "ecl/__init__.py"
+)