Skip to content

Commit 5807097

Browse files
committed
Catch more log files from pkgtest in CI + style fixes
1 parent b877be8 commit 5807097

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

ci_common/common.hocon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ common : ${java8Downloads} {
101101
logs: ${logfiles}
102102
catch_files : [
103103
"Graal diagnostic output saved in (?P<filename>.+\.zip)",
104-
"output mismatch file: (?P<filename>.+\.Rout)"
104+
"output mismatch file: (?P<filename>.+\.Rout)",
105+
"test had .fail outputs: \['(?P<filename>.+)'\]"
105106
]
106107
timelimit : "1:00:00"
107108
environment : {

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Attr.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected abstract static class PartialSearchCache extends Node {
133133
public abstract Object execute(DynamicObject attributes, String name);
134134

135135
@Specialization(guards = {"attrs.getShape() == cachedShape", "name.equals(cachedName)"}, limit = "getCacheSize(8)")
136-
protected Object doCached(DynamicObject attrs, String name,
136+
protected Object doCached(@SuppressWarnings("unused") DynamicObject attrs, @SuppressWarnings("unused") String name,
137137
@SuppressWarnings("unused") @Cached("attrs.getShape()") Shape cachedShape,
138138
@SuppressWarnings("unused") @Cached("name") String cachedName,
139139
@Cached("iterAttrAccess.execute(attrs,name)") Object result) {

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/variables/LocalReadVariableNode.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@
2828
import com.oracle.truffle.api.frame.Frame;
2929
import com.oracle.truffle.api.frame.FrameDescriptor;
3030
import com.oracle.truffle.api.frame.FrameSlot;
31-
import com.oracle.truffle.api.frame.FrameSlotKind;
3231
import com.oracle.truffle.api.frame.VirtualFrame;
3332
import com.oracle.truffle.api.nodes.InvalidAssumptionException;
34-
import com.oracle.truffle.api.nodes.Node;
3533
import com.oracle.truffle.api.nodes.UnexpectedResultException;
3634
import com.oracle.truffle.api.profiles.ConditionProfile;
3735
import com.oracle.truffle.api.profiles.ValueProfile;

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/ForEachAttributeNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static ForEachAttributeNode create(AttributeAction action) {
5757
* should be set by this function.
5858
*/
5959
public abstract static class AttributeAction extends Node {
60-
public void init(Context context) {
60+
public void init(@SuppressWarnings("unused") Context context) {
6161
// nop
6262
}
6363

com.oracle.truffle.r.test.packages/pkgtest/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ def _gnur_install_test(forwarded_args, pkgs, gnur_libinstall, gnur_install_tmp):
494494
def _set_test_status(fastr_test_info):
495495
def _failed_outputs(outputs):
496496
'''
497-
return True iff outputs has any .fail files
497+
return False iff outputs has no .fail files
498498
'''
499499
for _, testfile_status in outputs.iteritems():
500500
if testfile_status.status == "FAILED":
@@ -518,7 +518,7 @@ def _failed_outputs(outputs):
518518
# What this likely means is that some native package is not
519519
# installed on the system so GNUR can't run the tests.
520520
# Ideally this never happens.
521-
logging.info("{0}: GnuR test had .fail outputs: {1}".format(pkg, str(gnur_failed_outputs)))
521+
logging.info("{0}: GnuR test had .fail outputs: {1}".format(pkg, str([s + '.fail' for s in gnur_failed_outputs])))
522522

523523
fastr_failed_outputs = _failed_outputs(fastr_outputs)
524524
if fastr_failed_outputs:

0 commit comments

Comments
 (0)