Mercurial > hg > openjdk > aarch64-port > hotspot
changeset 8466:0b7060827bca
8080600: AARCH64: testlibrary does not support AArch64
Summary: Partial backport of 8080600 to make AArch64 a known platform
Reviewed-by: dholmes, coleenp
| author | aph |
|---|---|
| date | Tue, 23 Jun 2015 22:14:58 -0400 |
| parents | c8be46515581 |
| children | bf41eee321e5 c8076c718edd |
| files | test/testlibrary/com/oracle/java/testlibrary/Platform.java test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/testlibrary/com/oracle/java/testlibrary/Platform.java Thu Jun 18 23:42:09 2015 -0700 +++ b/test/testlibrary/com/oracle/java/testlibrary/Platform.java Tue Jun 23 22:14:58 2015 -0400 @@ -122,6 +122,10 @@ return isArch("(amd64)|(x86_64)"); } + public static boolean isAArch64() { + return isArch("aarch64"); + } + private static boolean isArch(String archnameRE) { return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE) .matcher(osArch)
--- a/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Thu Jun 18 23:42:09 2015 -0700 +++ b/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Tue Jun 23 22:14:58 2015 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ */ public class TestMutuallyExclusivePlatformPredicates { private static enum MethodGroup { - ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64"), + ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64", "isAArch64"), BITNESS("is32bit", "is64bit"), OS("isAix", "isLinux", "isSolaris", "isWindows", "isOSX"), VM_TYPE("isClient", "isServer", "isGraal", "isMinimal"),