From ef628cd07003aee26fdea0650eac6191ae8c2fc6 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 3 May 2023 11:08:58 +0200 Subject: [PATCH] Java: The models in the test should only add to the test pack. --- java/ql/test/experimental/configured-flow/test-all.ext.yml | 2 +- .../experimental/configured-flow/test-hardcoded-all.ext.yml | 2 +- .../configured-flow/test-hardcoded-remote.ext.yml | 2 +- .../experimental/configured-flow/test-hardcoded-sql.ext.yml | 2 +- .../configured-flow/test-hardcoded-standard.ext.yml | 2 +- .../configured-flow/test-relatedsourcemodels1.ext.yml | 2 +- .../configured-flow/test-relatedsourcemodels2.ext.yml | 4 ++-- java/ql/test/experimental/configured-flow/test-remote.ext.yml | 2 +- java/ql/test/experimental/configured-flow/test-sql.ext.yml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/ql/test/experimental/configured-flow/test-all.ext.yml b/java/ql/test/experimental/configured-flow/test-all.ext.yml index 8e081c3ad1a..a2131380ba7 100644 --- a/java/ql/test/experimental/configured-flow/test-all.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-all.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["remote"] diff --git a/java/ql/test/experimental/configured-flow/test-hardcoded-all.ext.yml b/java/ql/test/experimental/configured-flow/test-hardcoded-all.ext.yml index 8e081c3ad1a..a2131380ba7 100644 --- a/java/ql/test/experimental/configured-flow/test-hardcoded-all.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-hardcoded-all.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["remote"] diff --git a/java/ql/test/experimental/configured-flow/test-hardcoded-remote.ext.yml b/java/ql/test/experimental/configured-flow/test-hardcoded-remote.ext.yml index 64f76d8ac79..b6f3e001002 100644 --- a/java/ql/test/experimental/configured-flow/test-hardcoded-remote.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-hardcoded-remote.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["remote"] diff --git a/java/ql/test/experimental/configured-flow/test-hardcoded-sql.ext.yml b/java/ql/test/experimental/configured-flow/test-hardcoded-sql.ext.yml index 5849ebb063a..e1b273a0fcf 100644 --- a/java/ql/test/experimental/configured-flow/test-hardcoded-sql.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-hardcoded-sql.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["sql"] diff --git a/java/ql/test/experimental/configured-flow/test-hardcoded-standard.ext.yml b/java/ql/test/experimental/configured-flow/test-hardcoded-standard.ext.yml index cc177713287..f3630e8848c 100644 --- a/java/ql/test/experimental/configured-flow/test-hardcoded-standard.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-hardcoded-standard.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["standard"] diff --git a/java/ql/test/experimental/configured-flow/test-relatedsourcemodels1.ext.yml b/java/ql/test/experimental/configured-flow/test-relatedsourcemodels1.ext.yml index aee48077df0..2d151b4cc88 100644 --- a/java/ql/test/experimental/configured-flow/test-relatedsourcemodels1.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-relatedsourcemodels1.ext.yml @@ -1,6 +1,6 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["standard"] \ No newline at end of file diff --git a/java/ql/test/experimental/configured-flow/test-relatedsourcemodels2.ext.yml b/java/ql/test/experimental/configured-flow/test-relatedsourcemodels2.ext.yml index 97f4f225194..ae4e1b819b2 100644 --- a/java/ql/test/experimental/configured-flow/test-relatedsourcemodels2.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-relatedsourcemodels2.ext.yml @@ -1,13 +1,13 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["standard"] - ["group1"] - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: threatModelGrouping data: - ["kind10", "group1"] diff --git a/java/ql/test/experimental/configured-flow/test-remote.ext.yml b/java/ql/test/experimental/configured-flow/test-remote.ext.yml index 64f76d8ac79..b6f3e001002 100644 --- a/java/ql/test/experimental/configured-flow/test-remote.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-remote.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["remote"] diff --git a/java/ql/test/experimental/configured-flow/test-sql.ext.yml b/java/ql/test/experimental/configured-flow/test-sql.ext.yml index 5849ebb063a..e1b273a0fcf 100644 --- a/java/ql/test/experimental/configured-flow/test-sql.ext.yml +++ b/java/ql/test/experimental/configured-flow/test-sql.ext.yml @@ -1,7 +1,7 @@ extensions: - addsTo: - pack: codeql/java-all + pack: codeql/java-tests extensible: supportedThreatModel data: - ["sql"]