Skip to content
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

ignore pointer size tests #120

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ignore pointer size tests #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1db53b
ignore pointer size tests
phi-gamma Feb 10, 2023
56ef3dc
fix platform detection logic on MacOS
phi-gamma Feb 10, 2023
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 BuildNative
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ export DYNCALL_HOME=$BASE_DIR/dyncall

DYNCALL_DIFF=$BASE_DIR/src/main/cpp/bridj/dyncall.diff

function failed() {
echo "$@"
exit 1
}

if [[ ! -d "$DYNCALL_HOME" ]]
then
$BASE_DIR/admin/checkout_and_patch_dyncall.sh $DYNCALL_DIFF || failed "Failed to checkout and patch dyncall"
Expand Down Expand Up @@ -40,7 +45,7 @@ function get_arch() {
x86_64|amd64)
echo x64
;;
aarch64)
aarch64|arm64)
echo arm64
;;
arm*)
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/bridj/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@ public static String getMachine() {
return "i386"; // we are running a 32 bits JVM on a 64 bits platform
}
}
if (isMacOSX() && arch.equals("aarch64")) {
return "arm64";
}
return arch;
}

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/bridj/DemanglingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ static void checkSymbol(String demanglerName, String str, MemberRef symbol, Type
}

@Test
@Ignore("Can’t work in JVM 12+: https://bugs.openjdk.org/browse/JDK-8210522")
public void testIntVsPointer_32bits() throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
force32Bits();

Expand All @@ -562,6 +563,7 @@ public void testIntVsPointer_32bits() throws NoSuchFieldException, IllegalArgume
}

@Test
@Ignore("Can’t work in JVM 12+: https://bugs.openjdk.org/browse/JDK-8210522")
public void testIntVsPointer_64bits() throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
force64Bits();

Expand Down