You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ok...@apache.org on 2019/04/10 22:29:39 UTC
[madlib] 02/02: Madpack: Fix IC/DC check to include wcc
This is an automated email from the ASF dual-hosted git repository.
okislal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 50d8b5942fb872f44457a266dac22683756275c0
Author: Ekta Khanna <ek...@pivotal.io>
AuthorDate: Wed Apr 10 15:28:30 2019 -0700
Madpack: Fix IC/DC check to include wcc
Closes #364
Co-authored-by: Orhan Kislal <ok...@apache.org>
---
src/madpack/madpack.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index 6c191ca..d5eb3da 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -666,7 +666,7 @@ def _process_py_sql_files_in_modules(modset, args_dict):
if madpack_cmd == 'install-check':
mask = maddir_mod_sql + '/' + module + '/test/*.ic.sql_in'
else:
- mask = maddir_mod_sql + '/' + module + '/test/*[!ic].sql_in'
+ mask = maddir_mod_sql + '/' + module + '/test/*.sql_in'
elif calling_operation == UNIT_TEST:
mask = maddir_mod_py + '/' + module + '/test/unit_tests/test_*.py'
else:
@@ -674,6 +674,8 @@ def _process_py_sql_files_in_modules(modset, args_dict):
# Loop through all SQL files for this module
source_files = glob.glob(mask)
+ if calling_operation == INSTALL_DEV_CHECK and madpack_cmd != 'install-check':
+ source_files = [s for s in source_files if '.ic' not in s]
# Do this error check only when running install/reinstall/upgrade
if calling_operation == DB_CREATE_OBJECTS and not source_files: