Merge pull request #18350 from jketema/test-cleanup-2

jketema · web-flow · commit 659ec66b5ebf · 2024-12-20T17:23:54.000+01:00
C++: Simplify more `semmle-extractor-options`
diff --git a/cpp/ql/test/library-tests/arguments/arguments.c b/cpp/ql/test/library-tests/arguments/arguments.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: -Werror
+
 #ifndef __CODEQL_TEST__
 #error __CODEQL_TEST__ missing
 #endif
diff --git a/cpp/ql/test/library-tests/arguments/arguments.expected b/cpp/ql/test/library-tests/arguments/arguments.expected
@@ -17,5 +17,4 @@
 | arguments.c | 17 | __CODEQL_TEST__ |
 | arguments.c | 18 | --gcc |
 | arguments.c | 19 | -w |
-| arguments.c | 20 | -Werror |
-| arguments.c | 21 | arguments.c |
+| arguments.c | 20 | arguments.c |
diff --git a/cpp/ql/test/library-tests/blocks/c/options b/cpp/ql/test/library-tests/blocks/c/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/blocks/capture/options b/cpp/ql/test/library-tests/blocks/capture/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/blocks/cpp/options b/cpp/ql/test/library-tests/blocks/cpp/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/blocks/deduplication/options b/cpp/ql/test/library-tests/blocks/deduplication/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/functionpointerish/options b/cpp/ql/test/library-tests/functionpointerish/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/rvalueCast/disabled.cpp b/cpp/ql/test/library-tests/rvalueCast/disabled.cpp
@@ -4,4 +4,4 @@ void disabled(void) {
    p = &(int)a;
 }
 
-// semmle-extractor-options: --microsoft /Zc:rvalueCast-
+// semmle-extractor-options: --microsoft --edg --preserve_lvalues_with_same_type_casts
diff --git a/cpp/ql/test/library-tests/rvalueCast/enabled.cpp b/cpp/ql/test/library-tests/rvalueCast/enabled.cpp
@@ -4,4 +4,4 @@ void enabled(void) {
    p = &(int)a;
 }
 
-// semmle-extractor-options: --microsoft /Zc:rvalueCast --expect_errors
+// semmle-extractor-options: --microsoft --edg --no_preserve_lvalues_with_same_type_casts --expect_errors
diff --git a/cpp/ql/test/library-tests/type_sizes/options b/cpp/ql/test/library-tests/type_sizes/options
@@ -1 +1 @@
-semmle-extractor-options: -fblocks
+semmle-extractor-options: --edg --blocks
diff --git a/cpp/ql/test/library-tests/udl/options b/cpp/ql/test/library-tests/udl/options
@@ -1 +1 @@
-semmle-extractor-options: --gnu_version 40801 --clang -Xclang-only=-Wno-reserved-user-defined-literal
+semmle-extractor-options: --gnu_version 40801 --clang --edg --no_reserved_user_defined_literal
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticFunctions/unused_functions.c b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticFunctions/unused_functions.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: -fblocks
+// semmle-extractor-options: --edg --blocks
 #ifdef COMPILABLE_TEST
 #include <stdio.h>
 #else
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/options b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/options
@@ -1 +1 @@
-semmle-extractor-options: --microsoft /Zc:wchar_t- --edg --target --edg win64
+semmle-extractor-options: --microsoft --edg --no_wchar_t_keyword --edg --target --edg win64

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-semmle-extractor-options: -fblocks`
	`1`	`+semmle-extractor-options: --edg --blocks`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ void disabled(void) {`
`4`	`4`	`p = &(int)a;`
`5`	`5`	`}`
`6`	`6`
`7`		`-// semmle-extractor-options: --microsoft /Zc:rvalueCast-`
	`7`	`+// semmle-extractor-options: --microsoft --edg --preserve_lvalues_with_same_type_casts`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ void enabled(void) {`
`4`	`4`	`p = &(int)a;`
`5`	`5`	`}`
`6`	`6`
`7`		`-// semmle-extractor-options: --microsoft /Zc:rvalueCast --expect_errors`
	`7`	`+// semmle-extractor-options: --microsoft --edg --no_preserve_lvalues_with_same_type_casts --expect_errors`