From 228f7acc11d25644355545e1c3da072720348d6a Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 6 Sep 2016 13:05:37 -0700
Subject: [PATCH] Only warn when created test directory cannot be deleted
---
.../src/com/oracle/truffle/r/test/TestBase.java | 2 +-
.../oracle/truffle/r/test/library/base/TestConnections.java | 2 +-
.../com/oracle/truffle/r/test/rpackages/TestRPackages.java | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
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 db059857d1..f4398009af 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 44d7c993ac..6ef52e9c76 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 c3cf409168..1b11023ce8 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);
}
}
}
--
GitLab