From 7f98fa58eb2f6b2d39b628326628347acc4427a2 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sun, 21 Jan 2018 18:21:34 +0200
Subject: [PATCH] Refactor test/Jamfile

---
 test/Jamfile.v2 | 110 ++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 74 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 006a309..00038dc 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -61,91 +61,53 @@ project
       return $(result) ;
    }
 
+   rule system-run- ( sources + )
+   {
+      local result ;
+
+      result += [ run $(sources) : : : <link>static : $(sources[1]:B)_static ] ;
+      result += [ run $(sources) : : : <link>shared : $(source:B)_shared ] ;
+      result += [ run $(sources) : : : -<library>/boost/system//boost_system <define>BOOST_ERROR_CODE_HEADER_ONLY : $(sources[1]:B)_header ] ;
+
+      return $(result) ;
+   }
+
+   rule system-run ( sources + )
+   {
+      local result = [ system-run- $(sources) ] ;
+
+      # Test a source file built with -std=c++03 linked with a System library built without -std=c++03
+      result += [ run $(sources) : : : <link>static <conditional>@cxx03 : $(sources[1]:B)_static_03 ] ;
+      result += [ run $(sources) : : : <link>shared <conditional>@cxx03 : $(sources[1]:B)_shared_03 ] ;
+
+      # Test a source file built with -std=c++11 linked with a System library built without -std=c++11
+      result += [ run $(sources) : : : <link>static <conditional>@cxx11 : $(sources[1]:B)_static_11 ] ;
+      result += [ run $(sources) : : : <link>shared <conditional>@cxx11 : $(sources[1]:B)_shared_11 ] ;
+
+      return $(result) ;
+   }
+
    test-suite "system"
-       : [ run error_code_test.cpp
-           : # command line
-           : # input files
-           : # requirements
-                   <link>static
-         ]
-         [ run error_code_test.cpp
-           :  :  : <link>shared : error_code_test_shared
-         ]
-         [ run error_code_test.cpp
-           :  :  : <link>static <conditional>@cxx03 : error_code_test_03
-         ]
-         [ run error_code_test.cpp
-           :  :  : <link>shared <conditional>@cxx03 : error_code_test_shared_03
-         ]
-         [ run error_code_test.cpp
-           :  :  : <link>static <conditional>@cxx11 : error_code_test_11
-         ]
-         [ run error_code_test.cpp
-           :  :  : <link>shared <conditional>@cxx11 : error_code_test_shared_11
-         ]
-         [ run error_code_user_test.cpp
-           :  :  : <link>static
-         ]
-         [ run error_code_user_test.cpp
-           :  :  : <link>shared : error_code_user_test_shared
-         ]
-         [ run system_error_test.cpp
-           :  :  : <link>static
-         ]
-         [ run system_error_test.cpp
-            :  :  : <link>shared : system_error_test_shared
-         ]
+       : [ system-run error_code_test.cpp ]
+         [ system-run error_code_user_test.cpp ]
+         [ system-run system_error_test.cpp ]
          [ run dynamic_link_test.cpp throw_test
            :  :  : <link>shared : throw_test_shared
          ]
-         [ run initialization_test.cpp
-            :  :  : <link>shared : initialization_test_shared
-         ]
+         [ system-run initialization_test.cpp ]
          [ run header_only_test.cpp
            :  :  : -<library>/boost/system//boost_system
          ]
-         [ run config_test.cpp
-           :  :  : <test-info>always_show_run_output 
-         ]
-         [ run std_interop_test.cpp
-           :  :  : <link>static
-         ]
-         [ run std_interop_test.cpp
-            :  :  : <link>shared : std_interop_test_shared
-         ]
-         [ run std_mismatch_test.cpp
-           :  :  : <link>static <conditional>@cxx03 : std_mismatch_test_03
-         ]
-         [ run std_mismatch_test.cpp
-           :  :  : <link>shared <conditional>@cxx03 : std_mismatch_test_shared_03
-         ]
-         [ run std_mismatch_test.cpp
-           :  :  : <link>static <conditional>@cxx11 : std_mismatch_test_11
-         ]
-         [ run std_mismatch_test.cpp
-           :  :  : <link>shared <conditional>@cxx11 : std_mismatch_test_shared_11
-         ]
          [ run header_only_test.cpp
            :  :  : -<library>/boost/system//boost_system <define>BOOST_NO_ANSI_APIS : header_only_test_no_ansi
          ]
-         [ run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp
-           :  :  : <link>static : single_instance_test_static
-         ]
-         [ run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp
-           :  :  : <link>shared : single_instance_test_shared
-         ]
-         [ run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp
-           :  :  : -<library>/boost/system//boost_system <define>BOOST_ERROR_CODE_HEADER_ONLY : single_instance_test_header
-         ]
-         [ run before_main_test.cpp
-           :  :  : <link>static : before_main_test_static
-         ]
-         [ run before_main_test.cpp
-           :  :  : <link>shared : before_main_test_shared
-         ]
-         [ run before_main_test.cpp
-           :  :  : -<library>/boost/system//boost_system <define>BOOST_ERROR_CODE_HEADER_ONLY : before_main_test_header
+         [ run config_test.cpp
+           :  :  : <test-info>always_show_run_output
          ]
+         [ system-run- std_interop_test.cpp ]
+         [ system-run std_mismatch_test.cpp ]
+         [ system-run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp ]
+         [ system-run before_main_test.cpp ]
          ;
 
 # Quick (CI) test