From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 27 Nov 2017 19:29:27 +0000 (+0100)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3.18~228
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5d2730ebe780871aad000c557cbe4e8f414a0134?hp=a54af5f04ecbfab678c59c04cd60acea403212d6

Merge branch 'master' of github.com:simgrid/simgrid
---

diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 99f3a3add3..cdd7cd797d 100644
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -13,14 +13,33 @@ public class VM extends Host {
 	private Host currentHost; 
 	private int coreAmount = 1;
 
-	/** Create a `basic' VM (i.e. 1GB of RAM, other values are not taken into account). */
+	/**
+	 * Create a `basic' VM : 1 core and 1GB of RAM.
+	 * @param host Host node
+	 * @param name name of the machine
+	 */	
 	public VM(Host host, String name) {
 		this(host,name, /*coreAmount*/1, 1024, 0, 0);
 	}
-	
+
+	/**
+	 * Create a VM without useless values (for humans)
+	 * @param host Host node
+	 * @param name name of the machine
+	 * @param coreAmount the amount of cores of the VM
+	 */	
 	public VM(Host host, String name, int coreAmount) {
 		this(host,name, coreAmount, 1024, 0, 0);
 	}
+
+	/**
+	 * Create a VM with 1 core
+	 * @param host Host node
+	 * @param name name of the machine
+	 * @param ramSize size of the RAM that should be allocated (in MBytes)
+	 * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
+	 * @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
+	 */	
 	public VM(Host host, String name, int ramSize, int migNetSpeed, int dpIntensity){
 		this(host, name, /*coreAmount*/1, ramSize, migNetSpeed, dpIntensity);
 	}
@@ -29,6 +48,7 @@ public class VM extends Host {
 	 * Create a VM
 	 * @param host Host node
 	 * @param name name of the machine
+	 * @param coreAmount the amount of cores of the VM
 	 * @param ramSize size of the RAM that should be allocated (in MBytes)
 	 * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
 	 * @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 68a661eb64..25aad527a7 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -431,7 +431,7 @@ if __name__ == '__main__':
            re.compile("For details see http://code.google.com/p/address-sanitizer/issues/detail\\?id=189"),
            re.compile("For details see https://github.com/google/sanitizers/issues/189"),
            re.compile("Python runtime initialized with LC_CTYPE=C .*"),
-           re.compile("^cmake: .*? no version information available (required by cmake)"), # Seen on CircleCI
+           re.compile("cmake: /usr/local/lib/libcurl.so.4: no version information available (required by cmake)"), # Seen on CircleCI
            ]
         TeshState().jenkins = True # This is a Jenkins build