graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java
Print this page
@@ -148,10 +148,16 @@
logInfo("PASSED: " + this.getClass());
return true;
}
private boolean compareObjects(Object first, Object second) {
+ if (first == null) {
+ return (second == null);
+ }
+ if (second == null) {
+ return (first == null);
+ }
Class<?> clazz = first.getClass();
if (clazz != second.getClass()) {
return false;
}
if (!clazz.isArray()) {
@@ -263,10 +269,15 @@
@Override
Object getElement(Object ary, int index) {
return Array.get(ary, index);
}
+
+ @Override
+ boolean isEquals(Object firstElement, Object secondElement) {
+ return compareObjects(firstElement, secondElement);
+ }
}
/**
* This isEqualsFP method allows subclass to override what FP equality means for this particular
* unit test.
@@ -494,11 +505,11 @@
private void createOkraKernel() {
// Call routines in the derived class to get the hsail code and kernel name.
String hsailSource = getHSAILSource(testMethod);
if (!okraLibExists) {
if (!gaveNoOkraWarning) {
- logger.fine("No Okra library detected, skipping all KernelTester tests in " + this.getClass().getPackage().getName());
+ logger.severe("No Okra library detected, skipping all KernelTester tests in " + this.getClass().getPackage().getName());
gaveNoOkraWarning = true;
}
}
// Ignore any kerneltester test if okra does not exist.
assumeTrue(okraLibExists);