Skip to content

Commit 12733a0

Browse files
committed
Update test/Jamfile
1 parent e5472d5 commit 12733a0

File tree

1 file changed

+22
-50
lines changed

1 file changed

+22
-50
lines changed

test/Jamfile

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@ project
1818
<library>/boost/align//boost_align
1919
<toolset>gcc:<cxxflags>-Wno-non-virtual-dtor
2020
<toolset>gcc:<cxxflags>-Wno-deprecated-declarations
21-
#<toolset>gcc:<cxxflags>-Wno-delete-non-virtual-dtor (not in 4.4/4.6)
21+
<toolset>gcc:<cxxflags>-Wno-delete-non-virtual-dtor
2222
;
2323

24-
local cnhash =
25-
26-
<library>/boost/container_hash//boost_container_hash
27-
[ requires cxx11_decltype cxx11_noexcept ]
28-
<toolset>gcc-4.6:<build>no ;
24+
local cnhash = <library>/boost/container_hash//boost_container_hash ;
2925

3026
# quick test (for CI)
3127
run quick.cpp ;
@@ -68,11 +64,7 @@ run yield_k_test.cpp : : : <threading>multi : yield_k_test.mt ;
6864
run spinlock_test.cpp ;
6965
run spinlock_try_test.cpp ;
7066
run spinlock_try_test.cpp : : : <threading>multi : spinlock_try_test.mt ;
71-
run spinlock_pool_test.cpp
72-
: : :
73-
# msvc-8.0, 9.0 optimizer codegen bug for `x % 41`
74-
<toolset>msvc-8.0,<variant>release:<build>no
75-
<toolset>msvc-9.0,<variant>release:<build>no ;
67+
run spinlock_pool_test.cpp ;
7668

7769
run make_shared_test.cpp ;
7870
run make_shared_move_emulation_test.cpp
@@ -98,8 +90,7 @@ run sp_recursive_assign2_test.cpp ;
9890
run sp_recursive_assign_rv_test.cpp ;
9991
run sp_recursive_assign2_rv_test.cpp ;
10092

101-
compile-fail auto_ptr_lv_fail.cpp
102-
: <toolset>gcc-4.4.7:<build>no <toolset>gcc-4.4:<build>no ;
93+
compile-fail auto_ptr_lv_fail.cpp ;
10394

10495
run atomic_count_test2.cpp ;
10596
run sp_typeinfo_test.cpp ;
@@ -182,33 +173,23 @@ compile-fail array_fail_dereference.cpp ;
182173
compile-fail array_fail_member_access.cpp ;
183174
compile-fail array_fail_array_access.cpp ;
184175

185-
run make_shared_array_test.cpp
186-
: : : <toolset>msvc-8.0:<build>no ;
176+
run make_shared_array_test.cpp ;
187177
run make_shared_arrays_test.cpp ;
188-
run make_shared_array_throws_test.cpp
189-
: : : <toolset>msvc-8.0:<build>no ;
190-
run make_shared_array_esft_test.cpp
191-
: : : <toolset>msvc-8.0:<build>no ;
192-
run make_shared_array_noinit_test.cpp
193-
: : : <toolset>msvc-8.0:<build>no ;
194-
run make_shared_array_value_test.cpp
195-
: : : <toolset>msvc-8.0:<build>no ;
178+
run make_shared_array_throws_test.cpp ;
179+
run make_shared_array_esft_test.cpp ;
180+
run make_shared_array_noinit_test.cpp ;
181+
run make_shared_array_value_test.cpp ;
196182
run allocate_shared_array_test.cpp ;
197183
run allocate_shared_arrays_test.cpp ;
198-
run allocate_shared_array_throws_test.cpp
199-
: : : <toolset>msvc-8.0:<build>no ;
200-
run allocate_shared_array_esft_test.cpp
201-
: : : <toolset>msvc-8.0:<build>no ;
202-
run allocate_shared_array_noinit_test.cpp
203-
: : : <toolset>msvc-8.0:<build>no ;
204-
run allocate_shared_array_value_test.cpp
205-
: : : <toolset>msvc-8.0:<build>no ;
184+
run allocate_shared_array_throws_test.cpp ;
185+
run allocate_shared_array_esft_test.cpp ;
186+
run allocate_shared_array_noinit_test.cpp ;
187+
run allocate_shared_array_value_test.cpp ;
206188
run allocate_shared_array_construct_test.cpp ;
207189

208190
run make_unique_test.cpp ;
209191
run make_unique_args_test.cpp ;
210-
run make_unique_value_test.cpp
211-
: : : <toolset>gcc-4.6:<cxxflags>-fno-deduce-init-list ;
192+
run make_unique_value_test.cpp ;
212193
run make_unique_noinit_test.cpp ;
213194
run make_unique_throws_test.cpp ;
214195
run make_unique_array_test.cpp ;
@@ -273,8 +254,7 @@ run shared_ptr_fn_test.cpp ;
273254
run get_deleter_test2.cpp ;
274255
run get_deleter_test3.cpp ;
275256
run get_deleter_array_test2.cpp ;
276-
run get_deleter_array_test3.cpp
277-
: : : <toolset>msvc-8.0:<build>no ;
257+
run get_deleter_array_test3.cpp ;
278258

279259
run sp_convertible_test2.cpp ;
280260

@@ -296,15 +276,13 @@ run allocate_local_shared_test.cpp ;
296276
run allocate_local_shared_esft_test.cpp ;
297277

298278
run make_local_shared_array_test.cpp ;
299-
run make_local_shared_arrays_test.cpp
300-
: : : <toolset>gcc-4.6.3_0x:<cxxflags>-fno-deduce-init-list ;
279+
run make_local_shared_arrays_test.cpp ;
301280
run make_local_shared_array_throws_test.cpp ;
302281
run make_local_shared_array_esft_test.cpp ;
303282
run make_local_shared_array_noinit_test.cpp ;
304283
run make_local_shared_array_value_test.cpp ;
305284
run allocate_local_shared_array_test.cpp ;
306-
run allocate_local_shared_arrays_test.cpp
307-
: : : <toolset>gcc-4.6.3_0x:<cxxflags>-fno-deduce-init-list ;
285+
run allocate_local_shared_arrays_test.cpp ;
308286
run allocate_local_shared_array_throws_test.cpp ;
309287
run allocate_local_shared_array_esft_test.cpp ;
310288
run allocate_local_shared_array_noinit_test.cpp ;
@@ -315,8 +293,7 @@ run local_sp_fn_test.cpp ;
315293
run lsp_convertible_test.cpp ;
316294
run lsp_convertible_test2.cpp ;
317295

318-
run make_shared_array_tmp_test.cpp
319-
: : : <toolset>msvc-8.0:<build>no ;
296+
run make_shared_array_tmp_test.cpp ;
320297

321298
run lw_thread_test.cpp
322299
: : : <threading>multi ;
@@ -354,9 +331,9 @@ run weak_ptr_alias_move_test.cpp ;
354331

355332
run sp_typeinfo_test.cpp : : : <rtti>off : sp_typeinfo_test_no_rtti ;
356333

357-
run get_deleter_test.cpp : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test_no_rtti ;
358-
run get_deleter_test2.cpp : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test2_no_rtti ;
359-
run get_deleter_test3.cpp : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test3_no_rtti ;
334+
run get_deleter_test.cpp : : : <rtti>off : get_deleter_test_no_rtti ;
335+
run get_deleter_test2.cpp : : : <rtti>off : get_deleter_test2_no_rtti ;
336+
run get_deleter_test3.cpp : : : <rtti>off : get_deleter_test3_no_rtti ;
360337

361338
run shared_from_test.cpp ;
362339
run weak_from_test.cpp ;
@@ -415,12 +392,7 @@ run lsp_hash_test.cpp
415392
: : : $(cnhash) ;
416393
run lsp_hash_test2.cpp ;
417394

418-
local MT =
419-
420-
<threading>multi
421-
<library>/boost/bind//boost_bind
422-
[ requires cxx11_decltype cxx11_noexcept ]
423-
<toolset>gcc-4.6:<build>no ;
395+
local MT = <threading>multi <library>/boost/bind//boost_bind ;
424396

425397
run atomic_count_mt_test.cpp
426398
: : : $(MT) ;

0 commit comments

Comments
 (0)