Merge pull request #18335 from jketema/test-cleanup

jketema · web-flow · commit 90d8fb1a05a8 · 2024-12-20T13:43:59.000+01:00
C++: Simplify some semmle-extractor-options in tests
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --clang_version --edg 190000
+// semmle-extractor-options: --clang --clang_version 190000
 
 struct S {
     void f() {}
diff --git a/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp b/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --c++11 --edg --nullptr
+// semmle-extractor-options: --clang -std=c++11 --edg --nullptr
 
 static int has_nullptr_f = __has_feature(cxx_nullptr);
 static int has_nullptr_e = __has_extension(cxx_nullptr);
diff --git a/cpp/ql/test/library-tests/complex_numbers/conjugation.c b/cpp/ql/test/library-tests/complex_numbers/conjugation.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --c99
+// semmle-extractor-options: -std=c99
 void f(_Complex double x) {
     x = ~x;
 }
diff --git a/cpp/ql/test/library-tests/complex_numbers/test.c b/cpp/ql/test/library-tests/complex_numbers/test.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
 void f(_Imaginary double x, _Imaginary double y) {
     double z;
     _Complex double w;
diff --git a/cpp/ql/test/library-tests/constants/addresses/addresses.cpp b/cpp/ql/test/library-tests/constants/addresses/addresses.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --c++14
+// semmle-extractor-options: -std=c++14
 
 const int int_const = 1;
 extern const int extern_int_const = 1;
diff --git a/cpp/ql/test/library-tests/constexpr_if/test.cpp b/cpp/ql/test/library-tests/constexpr_if/test.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --c++20
+// semmle-extractor-options: -std=c++20
 
 void test(void) {
     int x;
diff --git a/cpp/ql/test/library-tests/conversions/complex.c b/cpp/ql/test/library-tests/conversions/complex.c
@@ -6,4 +6,4 @@ void ComplexNumbers() {
   c = i;
   c = r;
 }
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
diff --git a/cpp/ql/test/library-tests/fold/fold.cpp b/cpp/ql/test/library-tests/fold/fold.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --c++17
+// semmle-extractor-options: -std=c++17
 
 template<typename ...Args>
 int sum(Args&&... args) {
diff --git a/cpp/ql/test/library-tests/ir/ir/complex.c b/cpp/ql/test/library-tests/ir/ir/complex.c
@@ -144,4 +144,4 @@ void complex_conversions(void) {
   ld = jld;
 }
 
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
diff --git a/cpp/ql/test/library-tests/ir/ir/coroutines.cpp b/cpp/ql/test/library-tests/ir/ir/coroutines.cpp
@@ -112,4 +112,4 @@ co_returnable_value co_yield_and_return_value(int i) {
 
 
 
-// semmle-extractor-options: --edg --c++20
+// semmle-extractor-options: -std=c++20
diff --git a/cpp/ql/test/library-tests/ir/types/complex.c b/cpp/ql/test/library-tests/ir/types/complex.c
@@ -12,4 +12,4 @@ void Imaginary(void) {
   // _Imaginary __float128 jf128;
 }
 
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
diff --git a/cpp/ql/test/library-tests/specifiers2/cpp20.cpp b/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --c++20
+// semmle-extractor-options: --clang -std=c++20
 
 namespace cpp20 {
 
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/b1.c b/cpp/ql/test/library-tests/structs/compatible_c/b1.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
 struct AppleCompatible { // Definitions of Apple are exactly the same in b1.c and b2.c
   int apple_x;
 };
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/b2.c b/cpp/ql/test/library-tests/structs/compatible_c/b2.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --microsoft --edg --c99
+// semmle-extractor-options: --microsoft -std=c99
 struct AppleCompatible { // Definitions of Apple are exactly the same in b1.c and b2.c
   int apple_x;
 };
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c b/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c
@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   unsigned int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: -std=c99 --clang --edg --clang_vector_types --gnu_version 40700
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c b/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c
@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   signed int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: -std=c99 --clang --edg --clang_vector_types --gnu_version 40700
diff --git a/cpp/ql/test/library-tests/syntax-zoo/builtin.c b/cpp/ql/test/library-tests/syntax-zoo/builtin.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --clang_version --edg 30500
+// semmle-extractor-options: --clang --clang_version 30500
 
 #define vector(elcount, type)  __attribute__((vector_size((elcount)*sizeof(type)))) type
 
diff --git a/cpp/ql/test/library-tests/syntax-zoo/cpp11.cpp b/cpp/ql/test/library-tests/syntax-zoo/cpp11.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --c++11
+// semmle-extractor-options: -std=c++11
 
 namespace range_based_for_11 {
   void array() {
diff --git a/cpp/ql/test/library-tests/syntax-zoo/cpp17.cpp b/cpp/ql/test/library-tests/syntax-zoo/cpp17.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --c++17
+// semmle-extractor-options: -std=c++17
 
 namespace std { typedef unsigned long size_t; }
 
diff --git a/cpp/ql/test/library-tests/types/datasizeof/datasizeof.cpp b/cpp/ql/test/library-tests/types/datasizeof/datasizeof.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --clang_version --edg 190000
+// semmle-extractor-options: --clang --clang_version 190000
 
 typedef unsigned int size_t;
 
diff --git a/cpp/ql/test/library-tests/vector_types/vector_types.cpp b/cpp/ql/test/library-tests/vector_types/vector_types.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --edg --clang_version --edg 30801
+// semmle-extractor-options: --clang --clang_version 30801
 // Compilable with: clang --std=c++0x -msse4.1 vector_types.cpp
 // (some bits also compilable with gcc)
 int printf(...);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// semmle-extractor-options: --clang --edg --clang_version --edg 190000`
	`1`	`+// semmle-extractor-options: --clang --clang_version 190000`
`2`	`2`
`3`	`3`	`struct S {`
`4`	`4`	`void f() {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// semmle-extractor-options: --edg --c99`
	`1`	`+// semmle-extractor-options: -std=c99`
`2`	`2`	`void f(_Complex double x) {`
`3`	`3`	`x = ~x;`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// semmle-extractor-options: --microsoft --edg --c99`
	`1`	`+// semmle-extractor-options: --microsoft -std=c99`
`2`	`2`	`void f(_Imaginary double x, _Imaginary double y) {`
`3`	`3`	`double z;`
`4`	`4`	`_Complex double w;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// semmle-extractor-options: --c++14`
	`1`	`+// semmle-extractor-options: -std=c++14`
`2`	`2`
`3`	`3`	`const int int_const = 1;`
`4`	`4`	`extern const int extern_int_const = 1;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// semmle-extractor-options: --edg --c++20`
	`1`	`+// semmle-extractor-options: -std=c++20`
`2`	`2`
`3`	`3`	`void test(void) {`
`4`	`4`	`int x;`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ void ComplexNumbers() {`
`6`	`6`	`c = i;`
`7`	`7`	`c = r;`
`8`	`8`	`}`
`9`		`-// semmle-extractor-options: --microsoft --edg --c99`
	`9`	`+// semmle-extractor-options: --microsoft -std=c99`
Original file line number	Diff line number	Diff line change
`@@ -144,4 +144,4 @@ void complex_conversions(void) {`
`144`	`144`	`ld = jld;`
`145`	`145`	`}`
`146`	`146`
`147`		`-// semmle-extractor-options: --microsoft --edg --c99`
	`147`	`+// semmle-extractor-options: --microsoft -std=c99`
Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,4 @@ co_returnable_value co_yield_and_return_value(int i) {`
`112`	`112`
`113`	`113`
`114`	`114`
`115`		`-// semmle-extractor-options: --edg --c++20`
	`115`	`+// semmle-extractor-options: -std=c++20`