Skip to content

Support for AARCH64 architecture on Linux #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Support for AARCH64 architecture on Linux #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/io/specto/hoverfly/junit/core/SystemConfigFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ SystemConfig createSystemConfig() {
}

if (systemInfo.is64BitSystem()) {
archType = ArchType.ARCH_AMD64;
if (systemInfo.isOsLinux() && systemInfo.isArmArchitecture()) {
archType = ArchType.ARCH_ARM64;
} else {
archType = ArchType.ARCH_AMD64;
}
} else {
archType = ArchType.ARCH_386;
}
Expand Down Expand Up @@ -66,6 +70,7 @@ String getName() {

enum ArchType {
ARCH_AMD64("amd64"),
ARCH_ARM64("arm64"),
ARCH_386("386");

private final String name;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/io/specto/hoverfly/junit/core/SystemInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class SystemInfo {
private final boolean isOsMac = SystemUtils.IS_OS_MAC;
private final boolean isOsLinux = SystemUtils.IS_OS_LINUX;
private final boolean is64BitSystem = SystemUtils.OS_ARCH.contains("64");
private final boolean isArmArchitecture = SystemUtils.OS_ARCH.contains("aarch");
private final String osName = SystemUtils.OS_NAME;

boolean isOsWindows() {
Expand All @@ -29,6 +30,10 @@ boolean is64BitSystem() {
return is64BitSystem;
}

boolean isArmArchitecture() {
return isArmArchitecture;
}

String getOsName() {
return osName;
}
Expand Down
15 changes: 13 additions & 2 deletions src/test/java/io/specto/hoverfly/junit/core/SystemConfigFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
import org.junit.Test;
import org.powermock.reflect.Whitebox;

import static io.specto.hoverfly.junit.core.SystemConfigFactory.ArchType.ARCH_386;
import static io.specto.hoverfly.junit.core.SystemConfigFactory.ArchType.ARCH_AMD64;
import static io.specto.hoverfly.junit.core.SystemConfigFactory.ArchType.*;
import static io.specto.hoverfly.junit.core.SystemConfigFactory.OsName.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
Expand Down Expand Up @@ -46,6 +45,18 @@ public void shouldCreateSystemConfigForLinux() {
assertThat(systemConfig.getOsName()).isEqualTo(LINUX);
}

@Test
public void shouldCreateSystemConfigWithArm64BitArchType() {

when(systemInfo.isOsLinux()).thenReturn(true);
when(systemInfo.is64BitSystem()).thenReturn(true);
when(systemInfo.isArmArchitecture()).thenReturn(true);

SystemConfig systemConfig = factory.createSystemConfig();

assertThat(systemConfig.getArchType()).isEqualTo(ARCH_ARM64);
}

@Test
public void shouldCreateSystemConfigForMac() {

Expand Down