From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 4 Jul 2019 15:24:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v3.23.2~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/228dec10fee7d30dd7c9edb93d0986940530f25e

Merge remote-tracking branch 'github/master'

(fixed comment in NativeLib.java)
---

228dec10fee7d30dd7c9edb93d0986940530f25e
diff --cc src/bindings/java/org/simgrid/NativeLib.java
index d452dfec15,b67462ee11..9592f82a03
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@@ -163,9 -163,9 +163,9 @@@ public final class NativeLib 
  		public void run() {
  			try {
  				for (File f : dir.listFiles())
- 					if (! f.delete() && !f.getAbsolutePath().contains("appveyor")) // Be silent on AppVeyor to not break the tests. Ugly trick :)
 -					if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on AppVeyor to not break the tests. Ugly trick :)
++					if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on Travis to not break the tests. Ugly trick :)
  						System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
- 				if (! dir.delete() && !dir.getAbsolutePath().contains("appveyor") )
+ 				if (! dir.delete() && !dir.getAbsolutePath().contains("travis") )
  					System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");			    	
  			} catch(Exception e) {
  				System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());