From 96e169aecfd6d853fee067fe36630573d1863de7 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Wed, 25 Oct 2017 01:28:45 +0100
Subject: [PATCH] Use single quotes for Windows compatibility

---
 regression/cbmc-java/classpath2/test.desc                     | 2 +-
 regression/cbmc-java/function1/test.desc                      | 2 +-
 regression/cbmc-java/function2/test.desc                      | 2 +-
 regression/cbmc-java/function3/test.desc                      | 2 +-
 regression/cbmc-java/function4/test.desc                      | 2 +-
 regression/cbmc-java/jar-file4/test.desc                      | 2 +-
 regression/cbmc-java/lazyloading11/test.desc                  | 2 +-
 regression/cbmc-java/lazyloading7/test.desc                   | 2 +-
 regression/cbmc-java/lazyloading8/test.desc                   | 2 +-
 regression/cbmc-java/lazyloading9/test.desc                   | 2 +-
 regression/cbmc-java/static_method1/test.desc                 | 2 +-
 regression/cbmc-java/swap2/test.desc                          | 2 +-
 regression/goto-cc-cbmc/Makefile                              | 4 ++--
 regression/goto-cc-cbmc/regenerate-entry-function/test.desc   | 2 +-
 regression/goto-cc-goto-analyzer/Makefile                     | 4 ++--
 .../goto-cc-goto-analyzer/regenerate-entry-function/test.desc | 2 +-
 regression/goto-instrument-typedef/Makefile                   | 4 ++--
 .../goto-instrument-typedef/typedef-anon-struct1/test.desc    | 2 +-
 .../goto-instrument-typedef/typedef-anon-struct2/test.desc    | 2 +-
 .../goto-instrument-typedef/typedef-anon-union1/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-anon-union2/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-const-struct1/test.desc   | 2 +-
 .../goto-instrument-typedef/typedef-const-type1/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-const-union1/test.desc    | 2 +-
 .../typedef-param-anon-struct1/test.desc                      | 2 +-
 .../typedef-param-anon-union1/test.desc                       | 2 +-
 .../goto-instrument-typedef/typedef-param-struct1/test.desc   | 2 +-
 .../goto-instrument-typedef/typedef-param-type1/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-param-type2/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-param-type3/test.desc     | 2 +-
 .../goto-instrument-typedef/typedef-param-union1/test.desc    | 2 +-
 .../typedef-return-anon-struct1/test.desc                     | 2 +-
 .../typedef-return-anon-union1/test.desc                      | 2 +-
 .../goto-instrument-typedef/typedef-return-struct1/test.desc  | 2 +-
 .../goto-instrument-typedef/typedef-return-type1/test.desc    | 2 +-
 .../goto-instrument-typedef/typedef-return-type2/test.desc    | 2 +-
 .../goto-instrument-typedef/typedef-return-type3/test.desc    | 2 +-
 .../goto-instrument-typedef/typedef-return-union1/test.desc   | 2 +-
 regression/goto-instrument-typedef/typedef-struct1/test.desc  | 2 +-
 regression/goto-instrument-typedef/typedef-struct2/test.desc  | 2 +-
 regression/goto-instrument-typedef/typedef-type1/test.desc    | 2 +-
 regression/goto-instrument-typedef/typedef-type2/test.desc    | 2 +-
 regression/goto-instrument-typedef/typedef-type3/test.desc    | 2 +-
 regression/goto-instrument-typedef/typedef-type4/test.desc    | 2 +-
 regression/goto-instrument-typedef/typedef-union1/test.desc   | 2 +-
 regression/goto-instrument-typedef/typedef-union2/test.desc   | 2 +-
 regression/goto-instrument/Makefile                           | 4 ++--
 47 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/regression/cbmc-java/classpath2/test.desc b/regression/cbmc-java/classpath2/test.desc
index ba3ea35b785..3f8043663f0 100644
--- a/regression/cbmc-java/classpath2/test.desc
+++ b/regression/cbmc-java/classpath2/test.desc
@@ -1,6 +1,6 @@
 CORE
 jarfile3.class
---function jarfile3.f --java-cp-include-files "jarfile3\.class"
+--function jarfile3.f --java-cp-include-files 'jarfile3\.class'
 ^EXIT=10$
 ^SIGNAL=0$
 .*SUCCESS$
diff --git a/regression/cbmc-java/function1/test.desc b/regression/cbmc-java/function1/test.desc
index 3800f47f81a..2b01e276991 100644
--- a/regression/cbmc-java/function1/test.desc
+++ b/regression/cbmc-java/function1/test.desc
@@ -1,6 +1,6 @@
 CORE
 Main.class
---function "Other.fail:()V"
+--function 'Other.fail:()V'
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$
diff --git a/regression/cbmc-java/function2/test.desc b/regression/cbmc-java/function2/test.desc
index 423018ec7c8..fd61e253b75 100644
--- a/regression/cbmc-java/function2/test.desc
+++ b/regression/cbmc-java/function2/test.desc
@@ -1,6 +1,6 @@
 CORE
 Main.class
---function "D.fail:()V"
+--function 'D.fail:()V'
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$
diff --git a/regression/cbmc-java/function3/test.desc b/regression/cbmc-java/function3/test.desc
index c40b8ddc743..c1a23e0431e 100644
--- a/regression/cbmc-java/function3/test.desc
+++ b/regression/cbmc-java/function3/test.desc
@@ -1,6 +1,6 @@
 KNOWNBUG
 Main.class
---function "A.dummy:()V"
+--function 'A.dummy:()V'
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-java/function4/test.desc b/regression/cbmc-java/function4/test.desc
index d7aabbbb7e6..51d7c89999b 100644
--- a/regression/cbmc-java/function4/test.desc
+++ b/regression/cbmc-java/function4/test.desc
@@ -1,6 +1,6 @@
 KNOWNBUG
 Main.class
---function "Other.fail"
+--function 'Other.fail'
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-java/jar-file4/test.desc b/regression/cbmc-java/jar-file4/test.desc
index 5c34bdcd5a8..a3e8b295262 100644
--- a/regression/cbmc-java/jar-file4/test.desc
+++ b/regression/cbmc-java/jar-file4/test.desc
@@ -1,6 +1,6 @@
 CORE
 C.jar
---function jarfile3.f --java-cp-include-files "@jar.json"
+--function jarfile3.f --java-cp-include-files '@jar.json'
 ^EXIT=10$
 ^SIGNAL=0$
 .*SUCCESS$
diff --git a/regression/cbmc-java/lazyloading11/test.desc b/regression/cbmc-java/lazyloading11/test.desc
index c74260ce902..1114831afb3 100644
--- a/regression/cbmc-java/lazyloading11/test.desc
+++ b/regression/cbmc-java/lazyloading11/test.desc
@@ -1,6 +1,6 @@
 CORE
 test.class
---lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point "test.sety:(I)V" --lazy-methods-extra-entry-point "test.sety:(F)V"
+--lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point 'test.sety:(I)V' --lazy-methods-extra-entry-point 'test.sety:(F)V'
 ^EXIT=0$
 ^SIGNAL=0$
 VERIFICATION SUCCESSFUL
diff --git a/regression/cbmc-java/lazyloading7/test.desc b/regression/cbmc-java/lazyloading7/test.desc
index 2d26cc1dfdb..3b2e305f66c 100644
--- a/regression/cbmc-java/lazyloading7/test.desc
+++ b/regression/cbmc-java/lazyloading7/test.desc
@@ -1,6 +1,6 @@
 CORE
 test.class
---lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point "test.sety:(I)V"
+--lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point 'test.sety:(I)V'
 ^EXIT=0$
 ^SIGNAL=0$
 VERIFICATION SUCCESSFUL
diff --git a/regression/cbmc-java/lazyloading8/test.desc b/regression/cbmc-java/lazyloading8/test.desc
index afad44d2c8f..777f1673de9 100644
--- a/regression/cbmc-java/lazyloading8/test.desc
+++ b/regression/cbmc-java/lazyloading8/test.desc
@@ -1,6 +1,6 @@
 CORE
 test.class
---lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point "test.sety:(F)V"
+--lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point 'test.sety:(F)V'
 ^EXIT=0$
 ^SIGNAL=0$
 VERIFICATION SUCCESSFUL
diff --git a/regression/cbmc-java/lazyloading9/test.desc b/regression/cbmc-java/lazyloading9/test.desc
index aa4ccefe783..ddd4fbd51c0 100644
--- a/regression/cbmc-java/lazyloading9/test.desc
+++ b/regression/cbmc-java/lazyloading9/test.desc
@@ -1,6 +1,6 @@
 CORE
 test.class
---lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point "test.*"
+--lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point 'test.*'
 ^EXIT=0$
 ^SIGNAL=0$
 VERIFICATION SUCCESSFUL
diff --git a/regression/cbmc-java/static_method1/test.desc b/regression/cbmc-java/static_method1/test.desc
index c26f4061d02..2881b8787ce 100644
--- a/regression/cbmc-java/static_method1/test.desc
+++ b/regression/cbmc-java/static_method1/test.desc
@@ -1,6 +1,6 @@
 CORE
 static_method1.class
---function "static_method1.f" --div-by-zero-check
+--function 'static_method1.f' --div-by-zero-check
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$
diff --git a/regression/cbmc-java/swap2/test.desc b/regression/cbmc-java/swap2/test.desc
index a7953d29a8b..69f2f769e40 100644
--- a/regression/cbmc-java/swap2/test.desc
+++ b/regression/cbmc-java/swap2/test.desc
@@ -1,6 +1,6 @@
 CORE
 org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class
---function "org.springframework.build.gradle.MergePlugin\$1\$_execute_closure1\$_closure2.\$getCallSiteArray:()[Lorg/codehaus/groovy/runtime/callsite/CallSite;"
+--function 'org.springframework.build.gradle.MergePlugin$1$_execute_closure1$_closure2.$getCallSiteArray:()[Lorg/codehaus/groovy/runtime/callsite/CallSite;'
 ^EXIT=0
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
diff --git a/regression/goto-cc-cbmc/Makefile b/regression/goto-cc-cbmc/Makefile
index 11ce6deb0ca..df9e1a6ce44 100644
--- a/regression/goto-cc-cbmc/Makefile
+++ b/regression/goto-cc-cbmc/Makefile
@@ -5,10 +5,10 @@ include ../../src/common
 
 ifeq ($(BUILD_ENV_),MSVC)
 	exe=../../../src/goto-cc/goto-cl
-	is_windows="true"
+	is_windows=true
 else
 	exe=../../../src/goto-cc/goto-cc
-	is_windows="false"
+	is_windows=false
 endif
 
 test:
diff --git a/regression/goto-cc-cbmc/regenerate-entry-function/test.desc b/regression/goto-cc-cbmc/regenerate-entry-function/test.desc
index ced965563f8..1ee374f196c 100644
--- a/regression/goto-cc-cbmc/regenerate-entry-function/test.desc
+++ b/regression/goto-cc-cbmc/regenerate-entry-function/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--function fun --cover branch"
+'--function fun --cover branch'
 ^EXIT=0$
 ^SIGNAL=0$
 ^x=
diff --git a/regression/goto-cc-goto-analyzer/Makefile b/regression/goto-cc-goto-analyzer/Makefile
index 7f62e471b48..4f05ef74fc8 100644
--- a/regression/goto-cc-goto-analyzer/Makefile
+++ b/regression/goto-cc-goto-analyzer/Makefile
@@ -5,10 +5,10 @@ include ../../src/common
 
 ifeq ($(BUILD_ENV_),MSVC)
 	exe=../../../src/goto-cc/goto-cl
-	is_windows="true"
+	is_windows=true
 else
 	exe=../../../src/goto-cc/goto-cc
-	is_windows="false"
+	is_windows=false
 endif
 
 test:
diff --git a/regression/goto-cc-goto-analyzer/regenerate-entry-function/test.desc b/regression/goto-cc-goto-analyzer/regenerate-entry-function/test.desc
index 0dd59956634..6e48067136c 100644
--- a/regression/goto-cc-goto-analyzer/regenerate-entry-function/test.desc
+++ b/regression/goto-cc-goto-analyzer/regenerate-entry-function/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--function fun --show-goto-functions"
+'--function fun --show-goto-functions'
 ^\s*fun\(x\);$
 ^EXIT=6$
 ^SIGNAL=0$
diff --git a/regression/goto-instrument-typedef/Makefile b/regression/goto-instrument-typedef/Makefile
index 56de781ae2c..e0fa37a0f93 100644
--- a/regression/goto-instrument-typedef/Makefile
+++ b/regression/goto-instrument-typedef/Makefile
@@ -5,10 +5,10 @@ include ../../src/common
 
 ifeq ($(BUILD_ENV_),MSVC)
 	exe=../../../src/goto-cc/goto-cl
-	is_windows="true"
+	is_windows=true
 else
 	exe=../../../src/goto-cc/goto-cc
-	is_windows="false"
+	is_windows=false
 endif
 
 test:
diff --git a/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc
index 59aba0e01a6..9fe8148da9b 100644
--- a/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc b/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc
index 490b6cc2623..7bc8b436b0c 100644
--- a/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-anon-union1/test.desc
index 86caf078d6a..452ab96857d 100644
--- a/regression/goto-instrument-typedef/typedef-anon-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-anon-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-anon-union2/test.desc b/regression/goto-instrument-typedef/typedef-anon-union2/test.desc
index 8d8ca64aa93..06e8834765c 100644
--- a/regression/goto-instrument-typedef/typedef-anon-union2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-anon-union2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-const-struct1/test.desc b/regression/goto-instrument-typedef/typedef-const-struct1/test.desc
index a6aad1f799a..6108d3c748c 100644
--- a/regression/goto-instrument-typedef/typedef-const-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-const-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-const-type1/test.desc b/regression/goto-instrument-typedef/typedef-const-type1/test.desc
index 481b097653f..f42e33d48b3 100644
--- a/regression/goto-instrument-typedef/typedef-const-type1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-const-type1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-const-union1/test.desc b/regression/goto-instrument-typedef/typedef-const-union1/test.desc
index cd303b85195..5509eae3f86 100644
--- a/regression/goto-instrument-typedef/typedef-const-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-const-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc
index 537526b4422..6e7b1a7af86 100644
--- a/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc
index 270316982a3..eb410ddec88 100644
--- a/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc
index c26ee458459..c854c49f9d2 100644
--- a/regression/goto-instrument-typedef/typedef-param-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-type1/test.desc b/regression/goto-instrument-typedef/typedef-param-type1/test.desc
index 050ac22b315..983f133b00d 100644
--- a/regression/goto-instrument-typedef/typedef-param-type1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-type1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-type2/test.desc b/regression/goto-instrument-typedef/typedef-param-type2/test.desc
index 53cdc42193e..3ab0a4c870b 100644
--- a/regression/goto-instrument-typedef/typedef-param-type2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-type2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-type3/test.desc b/regression/goto-instrument-typedef/typedef-param-type3/test.desc
index 6ba9d61f8ca..647c157fafc 100644
--- a/regression/goto-instrument-typedef/typedef-param-type3/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-type3/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-param-union1/test.desc b/regression/goto-instrument-typedef/typedef-param-union1/test.desc
index 466dd76ed52..6bf1afdf628 100644
--- a/regression/goto-instrument-typedef/typedef-param-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-param-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc
index 47964f71f66..1cdd14e9ba4 100644
--- a/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc
index 5a8d1b2062d..94ce1ccc788 100644
--- a/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc
index eade5942ac8..fa9e7afb14c 100644
--- a/regression/goto-instrument-typedef/typedef-return-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-type1/test.desc b/regression/goto-instrument-typedef/typedef-return-type1/test.desc
index ba1b96ce6b6..efc8f8476ad 100644
--- a/regression/goto-instrument-typedef/typedef-return-type1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-type1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-type2/test.desc b/regression/goto-instrument-typedef/typedef-return-type2/test.desc
index 1ecc9ea8e90..28d7c3e1703 100644
--- a/regression/goto-instrument-typedef/typedef-return-type2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-type2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-type3/test.desc b/regression/goto-instrument-typedef/typedef-return-type3/test.desc
index 2401af3ce8d..2ce71940ee5 100644
--- a/regression/goto-instrument-typedef/typedef-return-type3/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-type3/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-return-union1/test.desc b/regression/goto-instrument-typedef/typedef-return-union1/test.desc
index 0855b28f479..33b17ca0c49 100644
--- a/regression/goto-instrument-typedef/typedef-return-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-return-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-struct1/test.desc b/regression/goto-instrument-typedef/typedef-struct1/test.desc
index 6a02f2d2174..51c56222053 100644
--- a/regression/goto-instrument-typedef/typedef-struct1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-struct1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-struct2/test.desc b/regression/goto-instrument-typedef/typedef-struct2/test.desc
index 6a02f2d2174..51c56222053 100644
--- a/regression/goto-instrument-typedef/typedef-struct2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-struct2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-type1/test.desc b/regression/goto-instrument-typedef/typedef-type1/test.desc
index 7599f1759c0..a70bad5d3f7 100644
--- a/regression/goto-instrument-typedef/typedef-type1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-type1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-type2/test.desc b/regression/goto-instrument-typedef/typedef-type2/test.desc
index 3cf1e50a5a5..f82d00237a5 100644
--- a/regression/goto-instrument-typedef/typedef-type2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-type2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-type3/test.desc b/regression/goto-instrument-typedef/typedef-type3/test.desc
index aca9069695c..077cec97390 100644
--- a/regression/goto-instrument-typedef/typedef-type3/test.desc
+++ b/regression/goto-instrument-typedef/typedef-type3/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-type4/test.desc b/regression/goto-instrument-typedef/typedef-type4/test.desc
index 28163714070..5e3fd8af85d 100644
--- a/regression/goto-instrument-typedef/typedef-type4/test.desc
+++ b/regression/goto-instrument-typedef/typedef-type4/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-union1/test.desc b/regression/goto-instrument-typedef/typedef-union1/test.desc
index 8502d149cb1..b4eab1b58e3 100644
--- a/regression/goto-instrument-typedef/typedef-union1/test.desc
+++ b/regression/goto-instrument-typedef/typedef-union1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument-typedef/typedef-union2/test.desc b/regression/goto-instrument-typedef/typedef-union2/test.desc
index 0fc908a6ab5..629a76f7bfb 100644
--- a/regression/goto-instrument-typedef/typedef-union2/test.desc
+++ b/regression/goto-instrument-typedef/typedef-union2/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-symbol-table"
+--show-symbol-table
 // Enable multi-line checking
 activate-multi-line-match
 EXIT=0
diff --git a/regression/goto-instrument/Makefile b/regression/goto-instrument/Makefile
index a8d54370285..ae7718cd619 100644
--- a/regression/goto-instrument/Makefile
+++ b/regression/goto-instrument/Makefile
@@ -5,10 +5,10 @@ include ../../src/common
 
 ifeq ($(BUILD_ENV_),MSVC)
 	exe=../../../src/goto-cc/goto-cl
-	is_windows="true"
+	is_windows=true
 else
 	exe=../../../src/goto-cc/goto-cc
-	is_windows="false"
+	is_windows=false
 endif
 
 test: