Skip to content

Commit 2e3c859

Browse files
tautschnigkarkhaz
authored andcommitted
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.
1 parent 21476dd commit 2e3c859

File tree

9 files changed

+9
-14
lines changed

9 files changed

+9
-14
lines changed

regression/goto-cc-file-local/chain.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ for src in *.c; do
2929

3030
if [[ "${is_windows}" == "true" ]]; then
3131
"${goto_cc}" \
32-
/export-function-local-symbols \
33-
/verbosity 10 \
32+
--export-function-local-symbols \
33+
--verbosity 10 \
3434
${suffix} \
35-
/c"${base}.c" \
35+
/c "${base}.c" \
3636
/Fo"${OUT_FILE}"
3737

3838
elif [[ "${is_windows}" == "false" ]]; then
@@ -52,11 +52,11 @@ if is_in final-link "$ALL_ARGS"; then
5252
OUT_FILE=final-link.gb
5353
if [[ "${is_windows}" == "true" ]]; then
5454
"${goto_cc}" \
55-
/export-function-local-symbols \
56-
/verbosity 10 \
55+
--export-function-local-symbols \
56+
--verbosity 10 \
5757
${suffix} \
5858
./*.gb \
59-
/Fe "${OUT_FILE}"
59+
/Fe"${OUT_FILE}"
6060

6161
elif [[ "${is_windows}" == "false" ]]; then
6262
"${goto_cc}" \

regression/goto-cc-file-local/result-multi-file-bad/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link assertion-check
4-
54
^EXIT=10$
65
^SIGNAL=0$
76
^VERIFICATION FAILED$

regression/goto-cc-file-local/result-multi-file-good/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link assertion-check
4-
54
^EXIT=0$
65
^SIGNAL=0$
76
^VERIFICATION SUCCESSFUL$

regression/goto-cc-file-local/result-multi-file-transitive/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link assertion-check
4-
54
^EXIT=10$
65
^SIGNAL=0$
76
^VERIFICATION FAILED$

regression/goto-cc-file-local/result-suffix/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link assertion-check suffix
4-
54
^EXIT=10$
65
^SIGNAL=0$
76
^VERIFICATION FAILED$

regression/goto-cc-file-local/symbol-compiled/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
show-symbol-table
4-
54
^EXIT=0$
65
^SIGNAL=0$
76
^Symbol......: __CPROVER_file_local_main_c_foo$

regression/goto-cc-file-local/symbol-fully-linked/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link show-symbol-table
4-
54
^EXIT=0$
65
^SIGNAL=0$
76
^Symbol......: __CPROVER_file_local_main_c_foo$

regression/goto-cc-file-local/symbol-multi-file/test.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CORE
22
main.c
33
final-link show-symbol-table
4-
54
^EXIT=0$
65
^SIGNAL=0$
76
^Symbol......: __CPROVER_file_local_foo_c_foo$

src/goto-cc/ms_cl_cmdline.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ bool ms_cl_cmdlinet::parse(const std::vector<std::string> &arguments)
6161
{
6262
process_non_cl_option(arguments[i]);
6363

64-
if(arguments[i] == "--verbosity" || arguments[i] == "--function")
64+
if(
65+
arguments[i] == "--verbosity" || arguments[i] == "--function" ||
66+
arguments[i] == "--mangle-suffix")
6567
{
6668
if(i < arguments.size() - 1)
6769
{

0 commit comments

Comments
 (0)