From 8bfdafd3cf4c15a7a8aa4aa80275bf3b3326b226 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Thu, 1 Sep 2022 19:56:25 +0200 Subject: [PATCH 1/2] native test package build is dependent on Rin files --- com.oracle.truffle.r.test.native/packages/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.oracle.truffle.r.test.native/packages/package.mk b/com.oracle.truffle.r.test.native/packages/package.mk index 79d03bde73..5c8e9482f2 100644 --- a/com.oracle.truffle.r.test.native/packages/package.mk +++ b/com.oracle.truffle.r.test.native/packages/package.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2022, 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 @@ -44,7 +44,7 @@ TEMPLATE_FILE := ../Rutils/template.R all: $(RIN_R_FILES) $(PKG_TAR) -$(PKG_TAR): $(PKG_FILES) +$(PKG_TAR): $(PKG_FILES) $(RIN_R_FILES) (cd $(REPO_DIR); TZDIR=/usr/share/zoneinfo/ $(GNUR_HOME_BINARY)/bin/R CMD build $(CURDIR)/$(PACKAGE)) $(RIN_R_FILES): $(RIN_FILES) From eefbef93962a47c983c0aa0209ea0a8a5f62442c Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 2 Sep 2022 17:25:39 +0200 Subject: [PATCH 2/2] Revert "[GR-40221] Temporarily ignore testrffi package in native tests." This reverts commit 00435b0e95063b660dd7e1ebe96affb6b34065db. --- com.oracle.truffle.r.test.native/packages/pkg-filelist | 1 + com.oracle.truffle.r.test.native/packages/pkg-filelist.gctorture | 1 + com.oracle.truffle.r.test.native/packages/pkg-filelist.llvm | 1 + 3 files changed, 3 insertions(+) diff --git a/com.oracle.truffle.r.test.native/packages/pkg-filelist b/com.oracle.truffle.r.test.native/packages/pkg-filelist index cf2ef8aa56..21f2e18dc2 100644 --- a/com.oracle.truffle.r.test.native/packages/pkg-filelist +++ b/com.oracle.truffle.r.test.native/packages/pkg-filelist @@ -1,4 +1,5 @@ vanilla +testrffi tests4 gnurtests altreprffitests diff --git a/com.oracle.truffle.r.test.native/packages/pkg-filelist.gctorture b/com.oracle.truffle.r.test.native/packages/pkg-filelist.gctorture index e69de29bb2..0060e55928 100644 --- a/com.oracle.truffle.r.test.native/packages/pkg-filelist.gctorture +++ b/com.oracle.truffle.r.test.native/packages/pkg-filelist.gctorture @@ -0,0 +1 @@ +testrffi diff --git a/com.oracle.truffle.r.test.native/packages/pkg-filelist.llvm b/com.oracle.truffle.r.test.native/packages/pkg-filelist.llvm index a7fd9d3bf6..bbc3ba2a91 100644 --- a/com.oracle.truffle.r.test.native/packages/pkg-filelist.llvm +++ b/com.oracle.truffle.r.test.native/packages/pkg-filelist.llvm @@ -1,3 +1,4 @@ vanilla +testrffi tests4 altreprffitests