瀏覽代碼

HPCC-13525 Adding testing/regress/ecl to whitelist

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>
Michael Gardner 9 年之前
父節點
當前提交
07ce68b3ad

+ 1 - 2
testing/CMakeLists.txt

@@ -21,5 +21,4 @@ install( DIRECTORY regress DESTINATION "./testing" COMPONENT Runtime
          PATTERN "regress/ecl-test"
          PATTERN "regress/ecl-test.json"
          PATTERN "regress/environment.xml"
-         PATTERN "regress/README.rst"
-         PATTERN regress/ecl EXCLUDE )
+         PATTERN "regress/README.rst" )

+ 5 - 2
testing/regress/CMakeLists.txt

@@ -15,12 +15,13 @@
 #    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 DESTINATION "./testing/regress" COMPONENT Runtime
+Install ( DIRECTORY download hpcc ecl DESTINATION "./testing/regress" COMPONENT Runtime
           USE_SOURCE_PERMISSIONS
           FILES_MATCHING
           PATTERN "hpcc/__init__.py"
@@ -28,4 +29,6 @@ Install ( DIRECTORY download hpcc DESTINATION "./testing/regress" COMPONENT Runt
           PATTERN "download/donQuixote.txt"
           PATTERN "download/pge0112.txt"
           PATTERN "download/spray_test.txt"
- )
+          PATTERN "ecl/*.ecl"
+          PATTERN "ecl/*.xml"
+          PATTERN "ecl/*.queryxml" )

+ 28 - 0
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" )

+ 20 - 0
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" )