@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-static-analyzer-1

Author: Ella Ma (Snape3058)

diff --git a/clang/test/Analysis/PR37855.c b/clang/test/Analysis/z3/PR37855.c
similarity index 100%
rename from clang/test/Analysis/PR37855.c
rename to clang/test/Analysis/z3/PR37855.c
diff --git a/clang/test/Analysis/bitint-z3.c b/clang/test/Analysis/z3/bitint-z3.c
similarity index 100%
rename from clang/test/Analysis/bitint-z3.c
rename to clang/test/Analysis/z3/bitint-z3.c
diff --git a/clang/test/Analysis/cstring-addrspace.c b/clang/test/Analysis/z3/cstring-addrspace.c
similarity index 100%
rename from clang/test/Analysis/cstring-addrspace.c
rename to clang/test/Analysis/z3/cstring-addrspace.c
diff --git a/clang/test/Analysis/unary-sym-expr-z3-refutation.c b/clang/test/Analysis/z3/unary-sym-expr-z3-refutation.c
similarity index 100%
rename from clang/test/Analysis/unary-sym-expr-z3-refutation.c
rename to clang/test/Analysis/z3/unary-sym-expr-z3-refutation.c
diff --git a/clang/test/Analysis/z3-crosscheck-max-attempts.cpp b/clang/test/Analysis/z3/z3-crosscheck-max-attempts.cpp
similarity index 100%
rename from clang/test/Analysis/z3-crosscheck-max-attempts.cpp
rename to clang/test/Analysis/z3/z3-crosscheck-max-attempts.cpp
diff --git a/clang/test/Analysis/z3-crosscheck.c b/clang/test/Analysis/z3/z3-crosscheck.c
similarity index 99%
rename from clang/test/Analysis/z3-crosscheck.c
rename to clang/test/Analysis/z3/z3-crosscheck.c
index 8cbe7dd2975d0..41ecaee5529e0 100644
--- a/clang/test/Analysis/z3-crosscheck.c
+++ b/clang/test/Analysis/z3/z3-crosscheck.c
@@ -4,7 +4,7 @@
 
 void clang_analyzer_dump(float);
 
-int foo(int x) 
+int foo(int x)
 {
   int *z = 0;
   if ((x & 1) && ((x & 1) ^ 1))
diff --git a/clang/test/Analysis/z3-refute-enum-crash.cpp b/clang/test/Analysis/z3/z3-refute-enum-crash.cpp
similarity index 100%
rename from clang/test/Analysis/z3-refute-enum-crash.cpp
rename to clang/test/Analysis/z3/z3-refute-enum-crash.cpp
diff --git a/clang/test/Analysis/z3-unarysymexpr.c b/clang/test/Analysis/z3/z3-unarysymexpr.c
similarity index 100%
rename from clang/test/Analysis/z3-unarysymexpr.c
rename to clang/test/Analysis/z3/z3-unarysymexpr.c

Are the files on the list correct?

Besides, when I was working on this PR, I found that missing-z3-nocrash.c declares REQUIRES: no-z3, while print-ranges.cpp and PR24184.cpp declare UNSUPPORTED: z3. What are their differences?

This enables executing all test cases with the REQUIRES: z3 tag via the check-clang-analysis-z3 target.

I like the move, but I didn't get what you are saying here. Where is the logic adding the check-clang-analysis-z3 target and how are the tests skipped under that directory if the REQUIRES: z3 is not satisfied?

Are the files on the list correct?

Besides, when I was working on this PR, I found that missing-z3-nocrash.c declares REQUIRES: no-z3

So these properties that REQUIRES can check against are defined as the available_features inside clang/test/lit.cfg.py. You can look for z3 there. And I guess, it should add the no-z3 if it's not present (and it actually does!).

We can move the missing-z3-nocrash.c under the z3 directory.

[...] while print-ranges.cpp and PR24184.cpp declare UNSUPPORTED: z3. What are their differences?

AFAIK nothing. They are practically the same.
You should probably drop the no-z3 logic and use UNSUPPORTED: z3 instead. Nice catch.

This enables executing all test cases with the REQUIRES: z3 tag via the check-clang-analysis-z3 target.

I like the move, but I didn't get what you are saying here. Where is the logic adding the check-clang-analysis-z3 target and how are the tests skipped under that directory if the REQUIRES: z3 is not satisfied?

The check-clang-analysis-z3 target already exists (automatically added for subdirectories by function add_lit_testsuites in llvm/cmake/modules/AddLLVM.cmake), but it will only execute the tests in the Analysis/z3/ subdirectory. With this move, all z3-related tests can be run directly with this target.

We can move the missing-z3-nocrash.c under the z3 directory.

The explanation above is also why I did not move this file: when building the check-clang-analysis-z3 target, it will always get skipped as 'UNSUPPORTED'.
Or, do you mean the check-clang-analysis-z3 target can also be used to check the UNSUPPORTED: z3 tests when Z3 is disabled? This is also reasonable to me. If so, should I also move the other two, i.e., print-ranges.cpp and PR24184.cpp?

You should probably drop the no-z3 logic and use UNSUPPORTED: z3 instead. Nice catch.

I will do this for missing-z3-nocrash.c. But together with removing the no-z3 feature in clang/test/lit.cfg.py?

This enables executing all test cases with the REQUIRES: z3 tag via the check-clang-analysis-z3 target.

I like the move, but I didn't get what you are saying here. Where is the logic adding the check-clang-analysis-z3 target and how are the tests skipped under that directory if the REQUIRES: z3 is not satisfied?

The check-clang-analysis-z3 target already exists (automatically added for subdirectories by function add_lit_testsuites in llvm/cmake/modules/AddLLVM.cmake), but it will only execute the tests in the Analysis/z3/ subdirectory. With this move, all z3-related tests can be run directly with this target.

We can move the missing-z3-nocrash.c under the z3 directory.

The explanation above is also why I did not move this file: when building the check-clang-analysis-z3 target, it will always get skipped as 'UNSUPPORTED'. Or, do you mean the check-clang-analysis-z3 target can also be used to check the UNSUPPORTED: z3 tests when Z3 is disabled? This is also reasonable to me. If so, should I also move the other two, i.e., print-ranges.cpp and PR24184.cpp?

You should probably drop the no-z3 logic and use UNSUPPORTED: z3 instead. Nice catch.

I will do this for missing-z3-nocrash.c. But together with removing the no-z3 feature in clang/test/lit.cfg.py?

I didn't know about this build target. I think your judgment and decisions are correct and makes sense.

You should probably drop the no-z3 logic and use UNSUPPORTED: z3 instead. Nice catch.

I will do this for missing-z3-nocrash.c. But together with removing the no-z3 feature in clang/test/lit.cfg.py?

Makes sense to do it separately, yes.

I believe you have commit access, right?

@steakhal, I resigned from that list last year. Maybe I should apply for it again.

@steakhal, I resigned from that list last year. Maybe I should apply for it again.

I'm looking for you coming back one day :)
I'll merge this then.