diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java index db059857d111a57d1d97c709fca740139e5461fa..f4398009af752a575426e04c9a0bd474afa328f5 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java @@ -850,7 +850,7 @@ public class TestBase { protected static boolean deleteDir(Path dir) { try { Files.walkFileTree(dir, DELETE_VISITOR); - } catch (Exception e) { + } catch (Throwable e) { return false; } return true; diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java index 44d7c993ac79f7d9a55a043d9ebb02831a218789..6ef52e9c768594efaf0c4ffe72cc42efc88ccc7d 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java @@ -52,7 +52,7 @@ public class TestConnections extends TestBase { @AfterClass public static void teardownTestDir() { if (!deleteDir(testDir.testDirPath)) { - throw new AssertionError(); + System.err.println("WARNING: error deleting : " + testDir.testDirPath); } } diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rpackages/TestRPackages.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rpackages/TestRPackages.java index c3cf409168134d839ab1496851d83d4038a118bb..1b11023ce8e4fc4c334ad6907f0d9ef49433a04c 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rpackages/TestRPackages.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rpackages/TestRPackages.java @@ -150,8 +150,7 @@ public abstract class TestRPackages extends TestBase { Path packageDir = installDir().resolve(packageName); try { deleteDir(packageDir); - } catch (Exception e) { - e.printStackTrace(); + } catch (Throwable e) { return false; } return true; @@ -205,7 +204,7 @@ public abstract class TestRPackages extends TestBase { if (!checkOnly()) { for (String p : testPackages) { if (!uninstallPackage(p)) { - throw new AssertionError(); + System.err.println("WARNING: error deleting package: " + p); } } }