Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern committed 2009-10-23 14:59:07 -07:00
commit dec7508ed1
3 files changed
+11 -3

No files matched your search

+1
View File
@@ -115,6 +115,7 @@ JNIEXPORT jint SIGAR_JNI(win32_RegistryKey_RegLoadKey)
#endif
static DWORD RegOpenOpts[] = {
0,
KEY_WOW64_32KEY,
KEY_WOW64_64KEY
};
+9 -2
View File
@@ -98,11 +98,11 @@ public class TestPdh extends SigarTestCase {
public void testValidate() {
Object[][] tests = {
{ "\\Does Not\\Exist", new Integer(Pdh.NO_OBJECT) },
{ "\\Does Not\\Exist", new Integer(Pdh.NO_OBJECT), new Integer(Pdh.BAD_COUNTERNAME) },
{ "Does Not Exist", new Integer(Pdh.BAD_COUNTERNAME) },
{ "\\System\\DoesNotExist", new Integer(Pdh.NO_COUNTER) },
{ "\\Processor(666)\\% User Time", new Integer(Pdh.NO_INSTANCE) },
{ "\\System\\Threads", new Integer(Pdh.VALID_DATA) },
{ "\\System\\Threads", new Integer(Pdh.VALID_DATA), new Integer(Pdh.BAD_COUNTERNAME) },
//slow
//{ "\\\\-\\System\\Threads", new Integer(Pdh.NO_MACHINE) },
};
@@ -113,6 +113,13 @@ public class TestPdh extends SigarTestCase {
int status = Pdh.validate(path);
boolean expectedResult = (status == expect);
if (!expectedResult) {
if (tests[i].length == 3) {
expect = ((Integer)tests[i][2]).intValue();
expectedResult = (status == expect);
}
}
if (!expectedResult) {
traceln("[validate] " + path + "-->" +
Integer.toHexString(status).toUpperCase() +