From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 10 Oct 2019 21:20:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v3.25~553^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/81aeb6be42ea11d4090f465a774800e815e52b07?hp=f59f2a65aa7a80f417a3528cf9fe1cd511caed30

Merge remote-tracking branch 'origin/master'
---

diff --git a/.travis.yml b/.travis.yml
index ebe6fc1a17..544b719956 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ jobs:
       -  du -hs /tmp || true
       -  ctest --output-on-failure -R java
       -  df -h
-      -  du -hs /tmp || true
+      -  du -hc /tmp || true
 #      -  mingw32-make.exe VERBOSE=1 java-all && ctest --output-on-failure -R java
     - os: osx
       osx_image: xcode11
diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index a338cc3e93..5565b1b52a 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -165,10 +165,10 @@ public final class NativeLib {
                         try (Stream<Path> paths = Files.walk(dir.toPath())) {
                                 paths.sorted(java.util.Comparator.reverseOrder())
                                      .map(java.nio.file.Path::toFile)
-                                     //.peek(System.out::println) // Prints what gets removed
+                                     //.peek(System.err::println) // Prints what gets removed
                                      .forEach(java.io.File::delete);
 			} catch(Exception e) {
-				System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
+				System.err.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
 				e.printStackTrace();
                         }
 		}