Added CDSTEST_CFG envvar for stress test.

This enavar contains filename of test configuration

diff --git a/projects/Win/vc14/stress-framework.vcxproj b/projects/Win/vc14/stress-framework.vcxproj
index f4de7a03384b7a086374ff616ae0496d6ea3a233..0d255bc77ff24ae51bdf930fd79099b7b3e0f370 100644 (file)
--- a/projects/Win/vc14/stress-framework.vcxproj
+++ b/projects/Win/vc14/stress-framework.vcxproj
@@ -40,7 +40,14 @@
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">4267</DisableSpecificWarnings>\r
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4267</DisableSpecificWarnings>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\framework\config.cpp" />\r
+    <ClCompile Include="..\..\..\test\stress\framework\config.cpp">\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\..\test\stress\framework\ellen_bintree_update_desc_pool.cpp" />\r
     <ClCompile Include="..\..\..\test\stress\framework\michael_alloc.cpp" />\r
     <ClCompile Include="..\..\..\test\stress\framework\stress_test.cpp" />\r

diff --git a/test/stress/framework/config.cpp b/test/stress/framework/config.cpp
index 14505c0a680491a1251c60212236aaf456308ba8..2ba8ce222b51158af3088449a77b6e350f1a41a1 100644 (file)
--- a/test/stress/framework/config.cpp
+++ b/test/stress/framework/config.cpp
@@ -133,7 +133,12 @@ namespace cds_test {
             }
         }
 
-        if ( !cfg_file )
+        if ( !cfg_file ) {
+            // Get cfg filename from environment variable
+            cfg_file = getenv( "CDSTEST_CFG" );
+        }
+
+        if ( !cfg_file || *cfg_file == 0 )
             cfg_file = default_cfg_file;
 
         ::testing::Test::RecordProperty( "config_file", cfg_file );