azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust CLI tests for JSR305 annotations being extracted

Browse Source 
See the previous commits
This commit is contained in:
Denis.Zharkov
2023-03-13 10:52:49 +01:00
committed by Space Team
parent 13febaf978
commit bcbe26287a
29 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/compatqualDefault.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqualUsage.kt
$TESTDATA_DIR$/compatqual $TESTDATA_DIR$/compatqual
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/compatqualDisable.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqualUsage.kt
$TESTDATA_DIR$/compatqual $TESTDATA_DIR$/compatqual
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/compatqualEnable.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqualUsage.kt
$TESTDATA_DIR$/compatqual $TESTDATA_DIR$/compatqual
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/compatqualWrong.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqualUsage.kt
$TESTDATA_DIR$/compatqual $TESTDATA_DIR$/compatqual
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyByLv15.args
Vendored
+1
View File
@@ -3,5 +3,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyByLv16.args
Vendored
+1
View File
@@ -3,5 +3,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyDefault.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyIgnore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyStrict.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jspecifyWarn.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecifyUsage.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305AllIgnore.args
Vendored
+1
View File
@@ -3,5 +3,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305DefaultMigration.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/jsr305DefaultMigration.kt $TESTDATA_DIR$/jsr305DefaultMigration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305DeprecatedEnable.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305DeprecatedIgnore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305DeprecatedWarn.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305FqNameIgnore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305FqNameStrict.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305Ignore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305MigrationDefault.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305MigrationFqNameIgnore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305MigrationIgnore.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305MigrationWarn.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305Migration.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305NoFlag.args
Vendored
+1
View File
@@ -1,5 +1,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305Strict.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/jsr305Warn.args
Vendored
+1
View File
@@ -2,5 +2,6 @@
$TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305Usage.kt
$TESTDATA_DIR$/jsr305 $TESTDATA_DIR$/jsr305
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/nullabilityAnnotations.args
Vendored
+1
View File
@@ -5,5 +5,6 @@ $TESTDATA_DIR$/severalAnnotations.kt
$TESTDATA_DIR$/jspecify $TESTDATA_DIR$/jspecify
$TESTDATA_DIR$/compatqual $TESTDATA_DIR$/compatqual
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingArgs.args
Vendored
+1
View File
@@ -1,6 +1,7 @@
$TESTDATA_DIR$/overridingArgs.kt $TESTDATA_DIR$/overridingArgs.kt
$TESTDATA_DIR$/java $TESTDATA_DIR$/java
$FOREIGN_ANNOTATIONS_DIR$ $FOREIGN_ANNOTATIONS_DIR$
$JSR_305_DECLARATIONS$
-d -d
$TEMP_DIR$ $TEMP_DIR$
-Xnullability-annotations=@org.jetbrains.annotations\:warn -Xnullability-annotations=@org.jetbrains.annotations\:warn
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt
+1
View File
@@ -17,4 +17,5 @@
package org.jetbrains.kotlin.checkers package org.jetbrains.kotlin.checkers
const val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations" const val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations"
const val JSR_305_SOURCES_PATH = "third-party/jsr305"
const val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = "third-party/java8-annotations" const val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = "third-party/java8-annotations"
compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+4
View File
@@ -275,6 +275,10 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
"$FOREIGN_ANNOTATIONS_DIR$", "$FOREIGN_ANNOTATIONS_DIR$",
new File(ThirdPartyAnnotationPathsKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath() new File(ThirdPartyAnnotationPathsKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath()
) )
.replace(
"$JSR_305_DECLARATIONS$",
new File(ThirdPartyAnnotationPathsKt.JSR_305_SOURCES_PATH).getPath()
)
.replace( .replace(
"$FOREIGN_JAVA8_ANNOTATIONS_DIR$", "$FOREIGN_JAVA8_ANNOTATIONS_DIR$",
new File(ThirdPartyAnnotationPathsKt.FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH).getPath() new File(ThirdPartyAnnotationPathsKt.FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH).getPath()