Certified for Linux 3.1 - tests and startup no longer complains that …

…things may fail. Note that this has only been tested on Fedora 16.
palantir · Dec 17, 2011 · 6d38631 · 6d38631
1 parent 1b5df82
commit 6d38631
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/com/palantir/opensource/sysmon/linux/LinuxMonitor.java b/src/com/palantir/opensource/sysmon/linux/LinuxMonitor.java
@@ -180,7 +180,7 @@ public void verifyExecutionEnvironment(Properties config) throws SysmonException
 		if(!osName.equals("Linux")) {
 			throw new SysmonException("Linux monitoring can only run on Linux.  Platform: " + osName);
 		}
-		if(!osVersion.startsWith("2.6")) {
+		if(!osVersion.startsWith("2.6")  || !osVersion.startsWith("3.1")) {
 			log.warn("Linux monitoring has only been tested on Linux 2.6, " +
 			         "so some things may not work. Detected version: " + osVersion);
 		}

diff --git a/test/com/palantir/opensource/sysmon/linux/LinuxBaseTest.java b/test/com/palantir/opensource/sysmon/linux/LinuxBaseTest.java
@@ -25,10 +25,13 @@ protected void setUp() throws Exception {
 		String osName = System.getProperty("os.name","UNKNOWN"); // use default to avoid NPE
 		String osVersion = System.getProperty("os.version","UNKNOWN"); // use default to avoid NPE
 
+		System.out.println("OS: " + osName);
+		System.out.println("Version: " + osVersion);
+
 		if(!osName.equals("Linux")) {
 			fail("Linux tests can only run on a Linux system.  Platform: " + osName);
 		}
-		if(!osVersion.startsWith("2.6")) {
+		if(!osVersion.startsWith("2.6") && !osVersion.startsWith("3.1")) {
 			System.err.println("Running on Linux " + osVersion + " - untested.  " +
 							   "Good luck! (Things will probably break)");
 		}