CPP tests: Better JVM heap adjustment for 32-bit platforms.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6771638a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6771638a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6771638a Branch: refs/heads/ignite-1093-2 Commit: 6771638a5c88940073a2034e81e3f17d83c6cd69 Parents: 597c5d9 Author: vozerov-gridgain <[email protected]> Authored: Wed Sep 9 15:30:32 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Sep 9 15:30:32 2015 +0300 ---------------------------------------------------------------------- .../src/main/cpp/core-test/project/vs/core-test.vcxproj | 4 ++-- .../src/main/cpp/core-test/src/cache_query_test.cpp | 5 +++++ modules/platform/src/main/cpp/core-test/src/cache_test.cpp | 5 +++++ .../platform/src/main/cpp/core-test/src/ignition_test.cpp | 9 +++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj index aa8cb98..ca6ee1a 100644 --- a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj +++ b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj @@ -124,7 +124,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Async</ExceptionHandling> </ClCompile> <Link> @@ -158,7 +158,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Async</ExceptionHandling> </ClCompile> <Link> http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp index 99ef727..47009f4 100644 --- a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp @@ -199,8 +199,13 @@ struct CacheQueryTestSuiteFixture { cfg.jvmOptsLen = 5; cfg.jvmOpts = opts; +#ifdef IGNITE_TESTS_32 cfg.jvmInitMem = 256; cfg.jvmMaxMem = 768; +#else + cfg.jvmInitMem = 1024; + cfg.jvmMaxMem = 4096; +#endif char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH"); http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp index 4c1069c..3239d89 100644 --- a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp @@ -106,8 +106,13 @@ struct CacheTestSuiteFixture { cfg.jvmOptsLen = 5; cfg.jvmOpts = opts; +#ifdef IGNITE_TESTS_32 cfg.jvmInitMem = 256; cfg.jvmMaxMem = 768; +#else + cfg.jvmInitMem = 1024; + cfg.jvmMaxMem = 4096; +#endif char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH"); http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp index 3f5edca..e0e26d3 100644 --- a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp @@ -44,8 +44,13 @@ BOOST_AUTO_TEST_CASE(TestIgnition) cfg.jvmOptsLen = 5; cfg.jvmOpts = opts; - cfg.jvmInitMem = 256; - cfg.jvmMaxMem = 768; +#ifdef IGNITE_TESTS_32 + cfg.jvmInitMem = 256; + cfg.jvmMaxMem = 768; +#else + cfg.jvmInitMem = 1024; + cfg.jvmMaxMem = 4096; +#endif char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
