Skip to content

Commit 6f22946

Browse files
committed
feat(CI): exclude leveldb test for all
1 parent 116c77d commit 6f22946

File tree

2 files changed

+34
-39
lines changed

2 files changed

+34
-39
lines changed

framework/build.gradle

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,14 @@ tasks.register('solidityNodeGroupTests', Test) {
176176
includeTestsMatching "org.tron.program.SupplementTest"
177177
}
178178

179-
if (rootProject.archInfo.isArm64) {
180-
exclude { element ->
181-
element.file.name.toLowerCase().contains('leveldb')
182-
}
183-
filter {
184-
excludeTestsMatching '*.*leveldb*'
185-
excludeTestsMatching '*.*Leveldb*'
186-
excludeTestsMatching '*.*LevelDB*'
187-
excludeTestsMatching '*.*LevelDb*'
188-
}
179+
exclude { element ->
180+
element.file.name.toLowerCase().contains('leveldb')
181+
}
182+
filter {
183+
excludeTestsMatching '*.*leveldb*'
184+
excludeTestsMatching '*.*Leveldb*'
185+
excludeTestsMatching '*.*LevelDB*'
186+
excludeTestsMatching '*.*LevelDb*'
189187
}
190188

191189
testLogging {
@@ -315,18 +313,17 @@ tasks.register('rpcApiServicesGroupTests', Test) {
315313
includeTestsMatching "org.tron.core.services.filter.HttpApiAccessFilterTest"
316314
}
317315

318-
if (rootProject.archInfo.isArm64) {
319-
exclude { element ->
320-
element.file.name.toLowerCase().contains('leveldb')
321-
}
322-
filter {
323-
excludeTestsMatching '*.*leveldb*'
324-
excludeTestsMatching '*.*Leveldb*'
325-
excludeTestsMatching '*.*LevelDB*'
326-
excludeTestsMatching '*.*LevelDb*'
327-
}
316+
exclude { element ->
317+
element.file.name.toLowerCase().contains('leveldb')
318+
}
319+
filter {
320+
excludeTestsMatching '*.*leveldb*'
321+
excludeTestsMatching '*.*Leveldb*'
322+
excludeTestsMatching '*.*LevelDB*'
323+
excludeTestsMatching '*.*LevelDb*'
328324
}
329325

326+
330327
testLogging {
331328
events "passed", "skipped", "failed"
332329
exceptionFormat "full"
@@ -359,17 +356,16 @@ test {
359356
destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
360357
classDumpDir = file("$buildDir/jacoco/classpathdumps")
361358
}
362-
if (rootProject.archInfo.isArm64) {
363-
exclude { element ->
364-
element.file.name.toLowerCase().contains('leveldb')
365-
}
366-
filter {
367-
excludeTestsMatching '*.*leveldb*'
368-
excludeTestsMatching '*.*Leveldb*'
369-
excludeTestsMatching '*.*LevelDB*'
370-
excludeTestsMatching '*.*LevelDb*'
371-
}
359+
exclude { element ->
360+
element.file.name.toLowerCase().contains('leveldb')
372361
}
362+
filter {
363+
excludeTestsMatching '*.*leveldb*'
364+
excludeTestsMatching '*.*Leveldb*'
365+
excludeTestsMatching '*.*LevelDB*'
366+
excludeTestsMatching '*.*LevelDb*'
367+
}
368+
373369
if (isWindows()) {
374370
exclude '**/ShieldedTransferActuatorTest.class'
375371
exclude '**/BackupDbUtilTest.class'

plugins/build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,15 @@ test {
9595
classDumpDir = file("$buildDir/jacoco/classpathdumps")
9696
}
9797

98-
if (rootProject.archInfo.isArm64) {
99-
exclude 'org/tron/plugins/leveldb/**'
100-
filter {
101-
excludeTestsMatching '*.*leveldb*'
102-
excludeTestsMatching '*.*Leveldb*'
103-
excludeTestsMatching '*.*LevelDB*'
104-
excludeTestsMatching '*.*LevelDb*'
105-
excludeTestsMatching '*.*Archive*'
106-
}
98+
exclude 'org/tron/plugins/leveldb/**'
99+
filter {
100+
excludeTestsMatching '*.*leveldb*'
101+
excludeTestsMatching '*.*Leveldb*'
102+
excludeTestsMatching '*.*LevelDB*'
103+
excludeTestsMatching '*.*LevelDb*'
104+
excludeTestsMatching '*.*Archive*'
107105
}
106+
108107
}
109108

110109
jacocoTestReport {

0 commit comments

Comments
 (0)