File-local name mangling: fix Windows tests

The command-line options to goto-cl weren't passed correctly. Also do
not use blank lines as patterns as it confuses test.pl on Windows.
This commit is contained in:
Michael Tautschnig 2019-04-23 18:55:51 +00:00 committed by Kareem Khazem
parent 21476ddea8
commit 2e3c859d07
No known key found for this signature in database
GPG Key ID: 3A0F7E9F63800E38
9 changed files with 9 additions and 14 deletions

View File

@ -29,10 +29,10 @@ for src in *.c; do
if [[ "${is_windows}" == "true" ]]; then
"${goto_cc}" \
/export-function-local-symbols \
/verbosity 10 \
--export-function-local-symbols \
--verbosity 10 \
${suffix} \
/c"${base}.c" \
/c "${base}.c" \
/Fo"${OUT_FILE}"
elif [[ "${is_windows}" == "false" ]]; then
@ -52,11 +52,11 @@ if is_in final-link "$ALL_ARGS"; then
OUT_FILE=final-link.gb
if [[ "${is_windows}" == "true" ]]; then
"${goto_cc}" \
/export-function-local-symbols \
/verbosity 10 \
--export-function-local-symbols \
--verbosity 10 \
${suffix} \
./*.gb \
/Fe "${OUT_FILE}"
/Fe"${OUT_FILE}"
elif [[ "${is_windows}" == "false" ]]; then
"${goto_cc}" \

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link assertion-check
^EXIT=10$
^SIGNAL=0$
^VERIFICATION FAILED$

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link assertion-check
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link assertion-check
^EXIT=10$
^SIGNAL=0$
^VERIFICATION FAILED$

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link assertion-check suffix
^EXIT=10$
^SIGNAL=0$
^VERIFICATION FAILED$

View File

@ -1,7 +1,6 @@
CORE
main.c
show-symbol-table
^EXIT=0$
^SIGNAL=0$
^Symbol......: __CPROVER_file_local_main_c_foo$

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link show-symbol-table
^EXIT=0$
^SIGNAL=0$
^Symbol......: __CPROVER_file_local_main_c_foo$

View File

@ -1,7 +1,6 @@
CORE
main.c
final-link show-symbol-table
^EXIT=0$
^SIGNAL=0$
^Symbol......: __CPROVER_file_local_foo_c_foo$

View File

@ -61,7 +61,9 @@ bool ms_cl_cmdlinet::parse(const std::vector<std::string> &arguments)
{
process_non_cl_option(arguments[i]);
if(arguments[i] == "--verbosity" || arguments[i] == "--function")
if(
arguments[i] == "--verbosity" || arguments[i] == "--function" ||
arguments[i] == "--mangle-suffix")
{
if(i < arguments.size() - 1)
{