Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci-cd_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ function cmsbuild_args()
case $x in
upload_store ) ;;
estats ) ;;
debug:* ) arg="${arg} --define cms_debug_packages=$(echo $x | sed 's|^debug:||')" ;;
stdcxx:* ) arg="${arg} --define cms_override_standard=$(echo $x | sed 's|^stdcxx:||;s|:|,|g')" ;;
without:* ) arg="${arg} --build-without=$(echo $x | sed 's|^without:||;s|:|,|g')" ;;
system:* ) arg="${arg} --use-system-tools=$(echo $x | sed 's|^system:||;s|:|,|g')" ;;
microarchs:* ) arg="${arg} --vectorization=$(echo $x | sed 's|^microarchs:||;s|:|,|g')" ;;
Expand Down
4 changes: 3 additions & 1 deletion tests/test_config-map.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ def check_value(key, value):
continue
elif re.match(r"^(microarchs):x86-64-v\d$", item):
continue
elif re.match(r"^(system|without):[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)*$", item):
elif re.match(r"^(system|without|debug):[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)*$", item):
continue
elif re.match(r"^(stdcxx):[a-zA-Z0-9_-]+@\d+(:[a-zA-Z0-9_-]+@\d+)*$", item):
continue
else:
errors.append("Invalid item '%s' in '%s=%s'" % (item, key, value))
Expand Down
Loading