C++: Accept test changes.

Author: MathiasVP

cpp/ql/test/library-tests/dataflow/taint-tests/standalone_iterators.cpp

@@ -39,13 +39,13 @@ class non_iterator {
 void test_typedefs(int_iterator_by_typedefs source1) {
     sink(*source1); // $ ast,ir
     sink(*(source1++)); // $ ast,ir
-    sink(*(++source1)); // $ ast MISSING: ir
+    sink(*(++source1)); // $ ast,ir
 }
 
 void test_trait(int_iterator_by_trait source1) {
     sink(*source1); // $ ast,ir
     sink(*(source1++)); // $ ast,ir
-    sink(*(++source1)); // $ ast MISSING: ir
+    sink(*(++source1)); // $ ast,ir
 }
 
 void test_non_iterator(non_iterator source1) {

cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp

@@ -396,9 +396,9 @@ void test_string_iterators() {
 		sink(*(i2+1)); // $ ast,ir
 		sink(*(i2-1)); // $ ast,ir
 		i3 = i2;
-		sink(*(++i3)); // $ ast MISSING: ir
+		sink(*(++i3)); // $ ast,ir
 		i4 = i2;
-		sink(*(--i4)); // $ ast MISSING: ir
+		sink(*(--i4)); // $ ast,ir
 		i5 = i2;
 		i5++;
 		sink(*i5); // $ ast,ir

cpp/ql/test/library-tests/dataflow/taint-tests/stringstream.cpp

@@ -229,7 +229,7 @@ void test_getline()
 
 	sink(ss2.getline(b7, 1000).getline(b8, 1000)); // $ ast,ir
 	sink(b7); // $ ast,ir
-	sink(b8); // $ ast MISSING: ir
+	sink(b8); // $ ast,ir
 
 	sink(getline(ss1, s1));
 	sink(getline(ss2, s2)); // $ ast,ir
@@ -261,7 +261,7 @@ void test_chaining()
 
 	sink(ss1.get(b1, 100).unget().get(b2, 100)); // $ ast,ir
 	sink(b1); // $ ast,ir
-	sink(b2); // $ ast MISSING: ir
+	sink(b2); // $ ast,ir
 
 	sink(ss2.write("abc", 3).flush().write(source(), 3).flush().write("xyz", 3)); // $ ast MISSING: ir
 	sink(ss2); // $ ast MISSING: ir

cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp

@@ -192,7 +192,7 @@ void *memcpy(void *dest, void *src, int len);
 void test_memcpy(int *source) {
 	int x;
 	memcpy(&x, source, sizeof(int));
-	sink(x); // $ ast=192:23 MISSING: ir SPURIOUS: ast=193:6
+	sink(x); // $ ast=192:23 ir SPURIOUS: ast=193:6
 }
 
 // --- std::swap ---
@@ -518,7 +518,7 @@ void *mempcpy(void *dest, const void *src, size_t n);
 void test_mempcpy(int *source) {
 	int x;
 	mempcpy(&x, source, sizeof(int));
-	sink(x); // $ ast=518:24 MISSING: ir SPURIOUS: ast=519:6
+	sink(x); // $ ast=518:24 ir SPURIOUS: ast=519:6
 }
 
 // --- memccpy ---
@@ -528,7 +528,7 @@ void *memccpy(void *dest, const void *src, int c, size_t n);
 void test_memccpy(int *source) {
 	int dest[16];
 	memccpy(dest, source, 42, sizeof(dest));
-	sink(dest); // $ ast=528:24 MISSING: ir SPURIOUS: ast=529:6
+	sink(dest); // $ ast=528:24 ir SPURIOUS: ast=529:6
 }
 
 // --- strcat and related functions ---

cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected

@@ -1,13 +0,0 @@
-| standalone_iterators.cpp:42:10:42:10 | call to operator* | Fixed missing result:ir= |
-| standalone_iterators.cpp:48:10:48:10 | call to operator* | Fixed missing result:ir= |
-| string.cpp:399:8:399:8 | call to operator* | Fixed missing result:ir= |
-| string.cpp:399:8:399:15 | (reference dereference) | Fixed missing result:ir= |
-| string.cpp:401:8:401:8 | call to operator* | Fixed missing result:ir= |
-| string.cpp:401:8:401:15 | (reference dereference) | Fixed missing result:ir= |
-| stringstream.cpp:232:7:232:8 | Argument 0 indirection | Fixed missing result:ir= |
-| stringstream.cpp:232:7:232:8 | call to basic_string | Fixed missing result:ir= |
-| stringstream.cpp:264:7:264:8 | Argument 0 indirection | Fixed missing result:ir= |
-| stringstream.cpp:264:7:264:8 | call to basic_string | Fixed missing result:ir= |
-| taint.cpp:195:7:195:7 | x | Fixed missing result:ir= |
-| taint.cpp:521:7:521:7 | x | Fixed missing result:ir= |
-| taint.cpp:531:7:531:10 | Argument 0 indirection | Fixed missing result:ir= |