From: khizmax <libcds.dev@gmail.com>
Date: Wed, 1 Jun 2016 20:14:38 +0000 (+0300)
Subject: Added CDSTEST_CFG envvar for stress test.
X-Git-Tag: v2.2.0~237
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=52d627a95d37a658d5d27b74249265433e8fb7f1

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 f4de7a03..0d255bc7 100644
--- 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>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4267</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\framework\config.cpp" />
+    <ClCompile Include="..\..\..\test\stress\framework\config.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\..\test\stress\framework\ellen_bintree_update_desc_pool.cpp" />
     <ClCompile Include="..\..\..\test\stress\framework\michael_alloc.cpp" />
     <ClCompile Include="..\..\..\test\stress\framework\stress_test.cpp" />
diff --git a/test/stress/framework/config.cpp b/test/stress/framework/config.cpp
index 14505c0a..2ba8ce22 100644
--- 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 );