C++: Update tests after extractor changes related to static variables

Author: jketema

cpp/ql/test/library-tests/ir/ir/PrintAST.expected

@@ -10404,24 +10404,6 @@ ir.cpp:
 # 1245|                 Type = [PointerType] const char *
 # 1245|                 ValueCategory = prvalue(load)
 # 1246|     getStmt(3): [ReturnStmt] return ...
-# 1246|       getImplicitDestructorCall(0): [DestructorCall] call to ~String
-# 1246|           Type = [VoidType] void
-# 1246|           ValueCategory = prvalue
-# 1246|         getQualifier(): [VariableAccess] c
-# 1246|             Type = [Struct] String
-# 1246|             ValueCategory = lvalue
-# 1246|       getImplicitDestructorCall(1): [DestructorCall] call to ~String
-# 1246|           Type = [VoidType] void
-# 1246|           ValueCategory = prvalue
-# 1246|         getQualifier(): [VariableAccess] b
-# 1246|             Type = [Struct] String
-# 1246|             ValueCategory = lvalue
-# 1246|       getImplicitDestructorCall(2): [DestructorCall] call to ~String
-# 1246|           Type = [VoidType] void
-# 1246|           ValueCategory = prvalue
-# 1246|         getQualifier(): [VariableAccess] a
-# 1246|             Type = [Struct] String
-# 1246|             ValueCategory = lvalue
 # 1250| [TopLevelFunction] char* strcpy(char*, char const*)
 # 1250|   <params>: 
 # 1250|     getParameter(0): [Parameter] destination
@@ -16922,7 +16904,7 @@ ir.cpp:
 # 2172|       getImplicitDestructorCall(0): [DestructorCall] call to ~ClassWithDestructor
 # 2172|           Type = [VoidType] void
 # 2172|           ValueCategory = prvalue
-# 2172|         getQualifier(): [VariableAccess] b
+# 2172|         getQualifier(): [VariableAccess] a
 # 2172|             Type = [Class] ClassWithDestructor
 # 2172|             ValueCategory = lvalue
 # 2174| [TopLevelFunction] void static_variable_with_destructor_2()
@@ -16977,7 +16959,13 @@ ir.cpp:
 # 2183|       getImplicitDestructorCall(0): [DestructorCall] call to ~ClassWithDestructor
 # 2183|           Type = [VoidType] void
 # 2183|           ValueCategory = prvalue
-# 2183|         getQualifier(): [VariableAccess] c
+# 2183|         getQualifier(): [VariableAccess] b
+# 2183|             Type = [Class] ClassWithDestructor
+# 2183|             ValueCategory = lvalue
+# 2183|       getImplicitDestructorCall(1): [DestructorCall] call to ~ClassWithDestructor
+# 2183|           Type = [VoidType] void
+# 2183|           ValueCategory = prvalue
+# 2183|         getQualifier(): [VariableAccess] a
 # 2183|             Type = [Class] ClassWithDestructor
 # 2183|             ValueCategory = lvalue
 # 2185| [GlobalVariable] ClassWithDestructor global_class_with_destructor

cpp/ql/test/successor-tests/staticlocals/no_dynamic_init/exprs.expected

@@ -2,5 +2,3 @@
 | no_dynamic_init.cpp:5:12:5:35 | no_dynamic_init.cpp:5:12:5:35 | no_dynamic_init.cpp:5:12:5:35 | Goodbye cruel world.\n |
 | no_dynamic_init.cpp:5:12:5:35 | no_dynamic_init.cpp:5:12:5:35 | no_dynamic_init.cpp:5:12:5:35 | array to pointer conversion |
 | no_dynamic_init.cpp:11:10:11:10 | no_dynamic_init.cpp:11:10:11:10 | no_dynamic_init.cpp:11:10:11:10 | 0 |
-| no_dynamic_init.cpp:12:1:12:1 | no_dynamic_init.cpp:12:1:12:1 | no_dynamic_init.cpp:12:1:12:1 | call to ~Magic |
-| no_dynamic_init.cpp:12:1:12:1 | no_dynamic_init.cpp:12:1:12:1 | no_dynamic_init.cpp:12:1:12:1 | m |