ui: maximum allocated jvm memory configurable in preferences

* added setting for maximum memory allocated by JVM to Preferences window.
* a value of -1 ignores this setting
* changed default value for this setting to -1
* increased JNI version to Java 1.8

* disabled some file system tests for windows
This commit is contained in:
malte_langkabel
2016-09-29 10:05:03 +02:00
parent 52fb2ae6f6
commit e5cd905670
5 changed files with 39 additions and 7 deletions
+4
View File
@@ -54,6 +54,7 @@ public:
void test_find_file_infos()
{
#ifndef _WIN32
std::vector<std::string> extensions;
extensions.push_back(".h");
extensions.push_back(".hpp");
@@ -67,10 +68,12 @@ public:
TS_ASSERT_EQUALS(files.size(), 2);
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.h"));
#endif
}
void test_find_file_infos_with_symlinks()
{
#ifndef _WIN32
std::vector<std::string> extensions;
extensions.push_back(".h");
extensions.push_back(".hpp");
@@ -87,6 +90,7 @@ public:
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/main.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.h"));
#endif
}
void test_filesystem_finds_existing_files()