Skip to content

Commit aeddfa1

Browse files
committed
feat(test): exclude leveldb test for arm
1 parent 41e5dbd commit aeddfa1

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static def isX86() {
1111

1212
static def isArm64() {
1313
def arch = System.getProperty("os.arch").toLowerCase()
14-
return new Architectures.KnownArchitecture("arm64", "aarch64").isAlias(arch)
14+
return Architectures.AARCH64.isAlias(arch)
1515
}
1616

1717
if (isArm64() && !JavaVersion.current().is(JavaVersion.VERSION_17)) {

framework/build.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.gradle.nativeplatform.platform.internal.Architectures
2+
13
plugins {
24
id "org.gradle.test-retry" version "1.5.9"
35
id "org.sonarqube" version "2.6"
@@ -34,6 +36,11 @@ task version(type: Exec) {
3436
commandLine 'bash', '-c', '../ver.sh'
3537
}
3638

39+
static def isArm64() {
40+
def arch = System.getProperty("os.arch").toLowerCase()
41+
return Architectures.AARCH64.isAlias(arch)
42+
}
43+
3744
dependencies {
3845
//local libraries
3946
implementation fileTree(dir: 'libs', include: '*.jar')
@@ -122,6 +129,18 @@ test {
122129
destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
123130
classDumpDir = file("$buildDir/jacoco/classpathdumps")
124131
}
132+
if (isArm64()) {
133+
exclude { element ->
134+
element.file.name.toLowerCase().contains('leveldb')
135+
}
136+
exclude('org/tron/program/DBConvertTest')
137+
filter {
138+
excludeTestsMatching '*.*leveldb*'
139+
excludeTestsMatching '*.*Leveldb*'
140+
excludeTestsMatching '*.*LevelDB*'
141+
excludeTestsMatching '*.*LevelDb*'
142+
}
143+
}
125144
if (isWindows()) {
126145
exclude '**/ShieldedTransferActuatorTest.class'
127146
exclude '**/BackupDbUtilTest.class'

platform/build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@ static def isX86() {
1010

1111
static def isArm64() {
1212
def arch = System.getProperty("os.arch").toLowerCase()
13-
return new Architectures.KnownArchitecture("arm64", "aarch64").isAlias(arch)
13+
return Architectures.AARCH64.isAlias(arch)
1414
}
1515

1616
if (isX86()) {
1717
ext {
18-
leveldbGroup = "org.fusesource.leveldbjni"
19-
leveldbName = "leveldbjni-all"
20-
leveldbVersion = "1.8"
2118
rocksDBVersion = "5.15.10"
2219
}
2320
} else if (isArm64()) {
2421
ext {
25-
leveldbGroup = "com.halibobor"
26-
leveldbName = "leveldbjni-all"
27-
leveldbVersion = "1.18.3"
2822
rocksDBVersion = "7.7.3"
2923
}
3024
} else {
@@ -45,7 +39,7 @@ sourceSets {
4539
}
4640

4741
dependencies {
48-
api group: leveldbGroup, name: leveldbName, version: leveldbVersion
42+
api group: 'org.fusesource.leveldbjni', name: 'leveldbjni-all', version: '1.8'
4943
api group: 'org.rocksdb', name: 'rocksdbjni', version: rocksDBVersion
5044
}
5145

0 commit comments

Comments
 (0)