Skip to content

Commit cc3f37d

Browse files
committed
reorganize into separate gradle test suites
1 parent 2299add commit cc3f37d

200 files changed

Lines changed: 1479 additions & 1288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/spelling/expect.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ hotspot
119119
HQL
120120
Ifed
121121
img
122-
integtest
123122
interleavings
124123
interners
125124
INTKEY
@@ -132,6 +131,7 @@ JAN
132131
javac
133132
JAVACMD
134133
javadocs
134+
jctools
135135
JBridge
136136
jcache
137137
JCP

.github/scripts/analyze.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
set -eux
33

44
./gradlew --console colored \
5+
ecj \
6+
assemble \
7+
pmd -Ppmd \
8+
spotbugs -Pspotbugs \
59
forbiddenApis -PforbiddenApis \
6-
ecjJavaPoet ecjMain ecjCodeGen ecjJmh ecjTest ecjJcstress \
7-
pmdJavaPoet pmdMain pmdCodeGen pmdJmh pmdTest pmdJcstress -Ppmd \
8-
spotbugsJavaPoet spotbugsMain spotbugsCodeGen spotbugsJmh spotbugsTest spotbugsJcstress -Pspotbugs \
910
"$@"

.github/workflows/analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
- name: ECJ
4545
uses: ./.github/actions/run-gradle
4646
with:
47+
arguments: ecj
4748
java: ${{ env.JAVA_VERSION }}
4849
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
49-
arguments: ecjJavaPoet ecjMain ecjCodeGen ecjJmh ecjTest ecjJcstress
5050

5151
forbidden-apis:
5252
name: Forbidden APIs
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
java: ${{ env.JAVA_VERSION }}
9898
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
99-
arguments: pmdJavaPoet pmdMain pmdCodeGen pmdJmh pmdTest pmdJcstress -Ppmd
99+
arguments: pmd -Ppmd
100100
- name: Upload Reports
101101
if: always()
102102
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -153,9 +153,7 @@ jobs:
153153
with:
154154
java: ${{ env.JAVA_VERSION }}
155155
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
156-
arguments: >
157-
spotbugsJavaPoet spotbugsMain spotbugsCodeGen
158-
spotbugsJmh spotbugsTest spotbugsJcstress -Pspotbugs
156+
arguments: spotbugs -Pspotbugs
159157
- name: Upload Reports
160158
if: always()
161159
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/build-arm.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,16 @@ jobs:
9595
- caffeine:strongKeysAndSoftValuesSyncGuavaTest
9696
- caffeine:weakKeysAndWeakValuesSyncGuavaTest
9797
- caffeine:weakKeysAndSoftValuesSyncGuavaTest
98-
- caffeine:junitJupiterTest
99-
- caffeine:integrationTest
100-
- caffeine:standaloneTest
101-
- caffeine:isolatedTest
102-
- caffeine:junitTest
98+
- caffeine:eclipseTest
99+
- caffeine:jctoolsTest
100+
- caffeine:openjdkTest
101+
- caffeine:apacheTest
102+
- caffeine:googleTest
103+
- caffeine:jsr166Test
104+
- caffeine:moduleTest
105+
- caffeine:fuzzTest
106+
- caffeine:osgiTest
107+
- caffeine:test
103108
- simulator:run
104109
- jcache:check
105110
- guava:check

.github/workflows/build.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,15 @@ jobs:
111111
- caffeine:strongKeysAndSoftValuesSyncCaffeineTest
112112
- caffeine:weakKeysAndWeakValuesSyncCaffeineTest
113113
- caffeine:weakKeysAndSoftValuesSyncCaffeineTest
114-
- caffeine:junitJupiterTest
115-
- caffeine:integrationTest
116-
- caffeine:standaloneTest
117-
- caffeine:isolatedTest
118-
- caffeine:junitTest
114+
- caffeine:eclipseTest
115+
- caffeine:jctoolsTest
116+
- caffeine:openjdkTest
117+
- caffeine:apacheTest
118+
- caffeine:googleTest
119+
- caffeine:jsr166Test
120+
- caffeine:moduleTest
121+
- caffeine:osgiTest
122+
- caffeine:test
119123
- simulator:check
120124
- jcache:check
121125
- guava:check
@@ -165,10 +169,10 @@ jobs:
165169
java: 11
166170
- suite: caffeine:weakKeysAndSoftValuesSyncGuavaTest
167171
java: 11
168-
- suite: caffeine:fuzzTest
169-
java: 11
170172
- suite: caffeine:lincheckTest
171173
java: 25
174+
- suite: caffeine:fuzzTest
175+
java: 11
172176
env:
173177
JAVA_VERSION: ${{ matrix.java }}
174178
steps:

.github/workflows/early-access.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,15 @@ jobs:
9494
- caffeine:strongKeysAndSoftValuesSyncGuavaTest
9595
- caffeine:weakKeysAndWeakValuesSyncGuavaTest
9696
- caffeine:weakKeysAndSoftValuesSyncGuavaTest
97-
- caffeine:junitJupiterTest
98-
- caffeine:integrationTest
99-
- caffeine:standaloneTest
100-
- caffeine:isolatedTest
101-
- caffeine:junitTest
102-
- caffeine:fuzzTest
97+
- caffeine:eclipseTest
98+
- caffeine:jctoolsTest
99+
- caffeine:openjdkTest
100+
- caffeine:apacheTest
101+
- caffeine:googleTest
102+
- caffeine:jsr166Test
103+
- caffeine:moduleTest
104+
- caffeine:osgiTest
105+
- caffeine:test
103106
- simulator:check
104107
- jcache:check
105108
- guava:check

.github/workflows/spelling.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
uses: reviewdog/action-misspell@d6429416b12b09b4e2768307d53bef58d172e962 # v1.27.0
2929
with:
3030
reporter: github-check
31+
exclude: ./.github/actions/spelling/*
3132
github_token: ${{ secrets.GITHUB_TOKEN }}
3233

3334
check-spelling:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jitwatch.out
1616
.idea
1717
*.iml
1818
*.hprof
19+
crash-*
1920
hs_err_pid*.log
2021
replay_pid*.log
2122
simulator/src/main/resources/application.conf

.gitleaks.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[allowlist]
2+
description = "Ignore false positives"
3+
paths = [
4+
'''caffeine/build\.gradle\.kts''',
5+
'''.github/actions/spelling/block-delimiters\.list''',
6+
]

.gitleaksignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)