Просмотр исходного кода

status: merge from trunk

[SVN r50276]
Beman Dawes 17 лет назад
Родитель
Сommit
865aa4c7b8
3 измененных файлов с 479 добавлено и 388 удалено
  1. 112 163
      status/Jamfile.v2
  2. 8 0
      status/expected_results.xml
  3. 359 225
      status/explicit-failures-markup.xml

+ 112 - 163
status/Jamfile.v2

@@ -18,169 +18,118 @@ project status
     ;
 
 import testing ;
-
-alias test_exec_monitor : ../libs/test/build//boost_test_exec_monitor/<link>static ;
-alias unit_test_framework : ../libs/test/build//boost_unit_test_framework/<link>static ;
+import modules ;
+
+local rule run-tests ( tests * )
+{
+    local limit-tests = [ MATCH "^--limit-tests=(.*)" : [ modules.peek : ARGV ] ] ;
+    for local test in $(tests)
+    {
+        if $(limit-tests)
+        {
+            if [ MATCH "^($(limit-tests))" : $(test) ]
+            {
+                build-project ../libs/$(test) ;
+            }
+            else
+            {
+                use-project /boost/$(test) : ../libs/$(test) ;
+            }
+        }
+        else
+        {
+            build-project ../libs/$(test) ;
+        }
+    }
+}
 
 # Tests from Jamfiles in individual library test subdirectories
 # Please keep these in alphabetic order by test-suite name
-build-project ../libs/accumulators/test ;      # test-suite accumulators
-build-project ../libs/algorithm/minmax/test ;  # test-suite algorith/minmax
-build-project ../libs/algorithm/string/test ;  # test-suite algorithm/string
-build-project ../libs/asio/test ;              # test-suite asio
-build-project ../libs/assign/test ;            # test-suite assign
-build-project ../libs/any/test ;               # test-suite any
-build-project ../libs/bimap/test ;             # test-suite bimap
-build-project ../libs/bind/test ;              # test-suite bind
-build-project ../libs/circular_buffer/test ;   # test-suite circular_buffer
-build-project ../libs/concept_check ;          # test-suite concept_check
-build-project ../libs/conversion/test ;        # test-suite conversion
-build-project ../libs/date_time/test  ;        # test-suite date_time
-build-project ../libs/disjoint_sets ;          # test-suite disjoint_sets
-build-project ../libs/dynamic_bitset ;         # test-suite dynamic_bitset
-build-project ../libs/exception/test ;
-build-project ../libs/filesystem/test ;        # test-suite filesystem
-build-project ../libs/foreach/test ;           # test-suite foreach
-build-project ../libs/format/test ;            # test-suite format
-build-project ../libs/function/test ;          # test-suite function
-build-project ../libs/functional/hash/test ;   # test-suite functional/hash
-build-project ../libs/function_types/test ;    # test-suite function_types
-build-project ../libs/fusion/test ;            # test-suite fusion
-build-project ../libs/gil/test ;               # test-suite gil
-build-project ../libs/graph/test ;             # test-suite graph
-build-project ../libs/io/test ;                # test-suite io
-build-project ../libs/interprocess/example ;   # test-suite interprocess_example
-build-project ../libs/interprocess/test ;      # test-suite interprocess_test
-build-project ../libs/intrusive/example ;      # test-suite intrusive_example
-build-project ../libs/intrusive/test ;         # test-suite intrusive_test
-build-project ../libs/iostreams/test ;         # test-suite iostreams
-build-project ../libs/iterator/test ;          # test-suite iterator
-build-project ../libs/lambda/test ;            # test-suite lambda
-build-project ../libs/logic/test ;             # test-suite logic
-build-project ../libs/math/test ;              # test-suite math
-build-project ../libs/mpi/test ;               # test-suite mpi
-build-project ../libs/mpl/test ;               # test-suite mpl
-build-project ../libs/numeric/conversion/test ;  # test-suite numeric/conversion
-build-project ../libs/numeric/interval/test ;  # test-suite numeric/interval
-build-project ../libs/numeric/ublas/test ;     # test-suite numeirc/uBLAS
-build-project ../libs/multi_array/test ;       # test-suite multi_array
-build-project ../libs/multi_index/test ;       # test-suite multi_index
-build-project ../libs/optional/test ;          # test-suite optional
-build-project ../libs/parameter/test ;         # test-suite parameter
-build-project ../libs/program_options/test ;   # test-suite program_options
-build-project ../libs/property_map/test ;      # test-suite property_map
-build-project ../libs/proto/test ;             # test-suite proto
-build-project ../libs/ptr_container/test ;     # test-suite ptr_container
-build-project ../libs/python/test ;            # test-suite python
-build-project ../libs/random/test ;            # test-suite random
-build-project ../libs/range/test ;             # test-suite range
-build-project ../libs/regex/test ;             # test-suite regex
-build-project ../libs/regex/example ;          # test-suite regex-examples
-build-project ../libs/serialization/test ;     # test-suite serialization
-build-project ../libs/signals/test ;           # test-suite signals
-build-project ../libs/smart_ptr/test ;         # test-suite smart_ptr
-build-project ../libs/spirit/classic/test ;    # test-suite spirit classic
-build-project ../libs/spirit/test ;            # test-suite spirit v2
-build-project ../libs/statechart/test ;        # test-suite statechart
-build-project ../libs/static_assert ;          # test-suite static_assert
-build-project ../libs/system/test ;            # test-suite system
-build-project ../libs/test/test ;              # test-suite test
-build-project ../libs/thread/test ;            # test-suite thread
-build-project ../libs/tokenizer/test ;         # test-suite tokenizer
-build-project ../libs/tr1/test ;               # test-suite tr1
-build-project ../libs/tuple/test ;             # test-suite tuple
-build-project ../libs/type_traits/test ;       # test-suite type_traits
-build-project ../libs/typeof/test ;            # test-suite typeof
-build-project ../libs/units/test ;             # test-suite units
-build-project ../libs/unordered/test/unordered ; # test-suite unordered
-build-project ../libs/unordered/test/exception ; # test-suite unordered-exception
-build-project ../libs/utility/enable_if/test ; # test-suite utility/enable_if
-build-project ../libs/utility/swap/test ;      # test-suite utility/swap
-build-project ../libs/utility/test ;           # test-suite utility
-build-project ../libs/variant/test ;           # test-suite variant
-build-project ../libs/wave/test/build ;        # test-suite wave
-build-project ../libs/xpressive/test ;         # test-suite xpressive
-
-# Tests specified in this Jamfile
-
-    test-suite config
-        :
-          # FIXME: Ideally, this should be just an alias to 'main' test suite
-          # defined in libs/config/test/Jamfile.v2
-          # That way, we'll avoid code duplication and won't run additional
-          # tests in 'auxilliary' test suites, that need to be run and
-          # interpreted by humans.
-          # But such change will require tweaking libs/config/tools/generate.cpp
-          # so postponing to later.
-          [ run libs/config/test/config_test.cpp test_exec_monitor
-                : #args
-                : #input-files
-                : #requirements
-                <threading>multi #!!!<no-warn>config_test.cpp
-          ]
-           [ run libs/config/test/config_info.cpp : : : <test-info>always_show_run_output ]
-           [ run libs/config/test/math_info.cpp : : : <test-info>always_show_run_output <toolset>borland:<runtime-link>static <toolset>borland:<link>static ]
-           [ run libs/config/test/abi/abi_test.cpp libs/config/test/abi/main.cpp ]
-           [ run libs/config/test/limits_test.cpp test_exec_monitor ]
-           [ run libs/config/test/link/main.cpp ../libs/config/test/link//link_test
-                : #args
-                : #input-files
-                : #requirements
-                <runtime-link>shared
-                <define>BOOST_DYN_LINK=1
-                <define>BOOST_CONFIG_NO_LIB=1
-                :
-                config_link_test
-          ]
-          [ compile-fail libs/config/test/threads/test_thread_fail1.cpp ]
-          [ compile-fail libs/config/test/threads/test_thread_fail2.cpp ]
-        ;
-
-    test-suite array_suite # !!!
-        : [ run libs/array/array0.cpp ]
-          [ run libs/array/array1.cpp ]
-          [ run libs/array/array2.cpp ]
-          [ run libs/array/array3.cpp ]
-          [ run libs/array/array4.cpp ]
-          [ run libs/array/array5.cpp ]
-        ;
-
-    run libs/crc/crc_test.cpp test_exec_monitor ;
-
-    run libs/functional/function_test.cpp ;
-
-
-    test-suite integer
-        : [ run libs/integer/cstdint_test.cpp ]
-          [ run libs/integer/integer_test.cpp ]
-          [ run libs/integer/integer_traits_test.cpp test_exec_monitor ]
-        ;
-
-    run libs/pool/test/test_pool_alloc.cpp  test_exec_monitor ;
-
-    test-suite preprocessor
-        : [ compile libs/preprocessor/test/arithmetic.cpp ]
-          [ compile libs/preprocessor/test/array.cpp ]
-          [ compile libs/preprocessor/test/comparison.cpp ]
-          [ compile libs/preprocessor/test/control.cpp ]
-          [ compile libs/preprocessor/test/debug.cpp ]
-          [ compile libs/preprocessor/test/facilities.cpp ]
-          [ compile libs/preprocessor/test/iteration.cpp ]
-          [ compile libs/preprocessor/test/list.cpp ]
-          [ compile libs/preprocessor/test/logical.cpp ]
-          [ compile libs/preprocessor/test/repetition.cpp ]
-          [ compile libs/preprocessor/test/selection.cpp ]
-          [ compile libs/preprocessor/test/seq.cpp ]
-          [ compile libs/preprocessor/test/slot.cpp ]
-          [ compile libs/preprocessor/test/tuple.cpp ]
-        ;
-
-    test-suite rational
-        : [ run libs/rational/rational_example.cpp ]
-          [ run libs/rational/rational_test.cpp unit_test_framework ]
-        ;
-
-    compile libs/timer/timer_test.cpp ;
-
-
-
+run-tests
+    accumulators/test           # test-suite accumulators
+    algorithm/minmax/test       # test-suite algorith/minmax
+    algorithm/string/test       # test-suite algorithm/string
+    array/test                  # test-suite array
+    asio/test                   # test-suite asio
+    assign/test                 # test-suite assign
+    any/test                    # test-suite any
+    bimap/test                  # test-suite bimap
+    bind/test                   # test-suite bind
+    circular_buffer/test        # test-suite circular_buffer
+    concept_check               # test-suite concept_check
+    config/test                 # test-suite config
+    conversion/test             # test-suite conversion
+    crc/test                    # test-suite crc
+    date_time/test              # test-suite date_time
+    disjoint_sets               # test-suite disjoint_sets
+    dynamic_bitset              # test-suite dynamic_bitset
+    exception/test
+    filesystem/test             # test-suite filesystem
+    flyweight/test              # test-suite flyweight
+    foreach/test                # test-suite foreach
+    format/test                 # test-suite format
+    function/test               # test-suite function
+    functional/test             # test-suite functional
+    functional/hash/test        # test-suite functional/hash
+    function_types/test         # test-suite function_types
+    fusion/test                 # test-suite fusion
+    gil/test                    # test-suite gil
+    graph/test                  # test-suite graph
+    io/test                     # test-suite io
+    integer/test                # test-suite integer
+    interprocess/example        # test-suite interprocess_example
+    interprocess/test           # test-suite interprocess_test
+    intrusive/example           # test-suite intrusive_example
+    intrusive/test              # test-suite intrusive_test
+    iostreams/test              # test-suite iostreams
+    iterator/test               # test-suite iterator
+    lambda/test                 # test-suite lambda
+    logic/test                  # test-suite logic
+    math/test                   # test-suite math
+    mpi/test                    # test-suite mpi
+    mpl/test                    # test-suite mpl
+    numeric/conversion/test     # test-suite numeric/conversion
+    numeric/interval/test       # test-suite numeric/interval
+    numeric/ublas/test          # test-suite numeirc/uBLAS
+    multi_array/test            # test-suite multi_array
+    multi_index/test            # test-suite multi_index
+    optional/test               # test-suite optional
+    parameter/test              # test-suite parameter
+    pool/test                   # test-suite pool
+    preprocessor/test           # test-suite preprocessor
+    program_options/test        # test-suite program_options
+    property_map/test           # test-suite property_map
+    proto/test                  # test-suite proto
+    ptr_container/test          # test-suite ptr_container
+    python/test                 # test-suite python
+    random/test                 # test-suite random
+    range/test                  # test-suite range
+    rational/test               # test-suite rational
+    regex/test                  # test-suite regex
+    regex/example               # test-suite regex-examples
+    serialization/test          # test-suite serialization
+    signals/test                # test-suite signals
+    smart_ptr/test              # test-suite smart_ptr
+    spirit/classic/test         # test-suite classic spirit
+    spirit/test                 # test-suite spirit_v2
+    statechart/test             # test-suite statechart
+    static_assert               # test-suite static_assert
+    system/test                 # test-suite system
+    test/test                   # test-suite test
+    thread/test                 # test-suite thread
+    timer/test                  # test-suite timer
+    tokenizer/test              # test-suite tokenizer
+    tr1/test                    # test-suite tr1
+    tuple/test                  # test-suite tuple
+    type_traits/test            # test-suite type_traits
+    typeof/test                 # test-suite typeof
+    units/test                  # test-suite units
+    unordered/test/unordered    # test-suite unordered
+    unordered/test/exception    # test-suite unordered-exception
+    utility/enable_if/test      # test-suite utility/enable_if
+    utility/swap/test           # test-suite utility/swap
+    utility/test                # test-suite utility
+    variant/test                # test-suite variant
+    wave/test/build             # test-suite wave
+    xpressive/test              # test-suite xpressive
+    ;

Разница между файлами не показана из-за своего большого размера
+ 8 - 0
status/expected_results.xml


Разница между файлами не показана из-за своего большого размера
+ 359 - 225
status/explicit-failures-markup.xml


Некоторые файлы не были показаны из-за большого количества измененных файлов

粤ICP备19079148号