Skip to content

Commit 281dda0

Browse files
authored
Merge pull request #791 from boostorg/consolidate_tests
Try and consolidate more Github tests.
2 parents 54032b3 + 48f20e9 commit 281dda0

File tree

4 files changed

+70
-10
lines changed

4 files changed

+70
-10
lines changed

.github/workflows/ci.yml

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
compiler: [ g++-12, clang++-14 ]
2222
standard: [ c++14, c++17, c++20 ]
23-
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
23+
suite: [ github_ci_block_1, github_ci_block_2 ]
2424
steps:
2525
- uses: actions/checkout@v2
2626
with:
@@ -147,7 +147,7 @@ jobs:
147147
matrix:
148148
toolset: [ clang ]
149149
standard: [ 11, 14, 17, 20 ]
150-
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
150+
suite: [ github_ci_block_1, github_ci_block_2 ]
151151
steps:
152152
- uses: actions/checkout@v2
153153
with:
@@ -193,7 +193,55 @@ jobs:
193193
strategy:
194194
fail-fast: false
195195
matrix:
196-
toolset: [ gcc, msvc-14.0, msvc-14.2 ]
196+
toolset: [ msvc-14.0, msvc-14.2 ]
197+
standard: [ 14, 17 ]
198+
suite: [ github_ci_block_1, github_ci_block_2 ]
199+
steps:
200+
- uses: actions/checkout@v2
201+
with:
202+
fetch-depth: '0'
203+
- uses: mstachniuk/ci-skip@v1
204+
with:
205+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX];[standalone];[STANDALONE];[cygwin];[CYGWIN]'
206+
commit-filter-separator: ';'
207+
fail-fast: true
208+
- name: Checkout main boost
209+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
210+
- name: Update tools/boostdep
211+
run: git submodule update --init tools/boostdep
212+
working-directory: ../boost-root
213+
- name: Copy files
214+
run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math
215+
working-directory: ../boost-root
216+
- name: Install deps
217+
run: python tools/boostdep/depinst/depinst.py math
218+
working-directory: ../boost-root
219+
- name: Bootstrap
220+
run: bootstrap
221+
working-directory: ../boost-root
222+
- name: Generate headers
223+
run: b2 headers
224+
working-directory: ../boost-root
225+
- name: Config info install
226+
run: ..\..\..\b2 config_info_travis_install %ARGS%
227+
working-directory: ../boost-root/libs/config/test
228+
- name: Config info
229+
run: config_info_travis
230+
working-directory: ../boost-root/libs/config/test
231+
- name: Test
232+
run: ..\..\..\b2 --hash %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES ${{ matrix.suite }}
233+
working-directory: ../boost-root/libs/math/test
234+
windows_gcc:
235+
runs-on: windows-2019
236+
defaults:
237+
run:
238+
shell: cmd
239+
env:
240+
ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }}
241+
strategy:
242+
fail-fast: false
243+
matrix:
244+
toolset: [ gcc ]
197245
standard: [ 14, 17 ]
198246
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
199247
steps:
@@ -242,7 +290,7 @@ jobs:
242290
fail-fast: false
243291
matrix:
244292
standard: [ 14, 17, 20 ]
245-
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
293+
suite: [ github_ci_block_1, github_ci_block_2 ]
246294
steps:
247295
- uses: actions/checkout@v2
248296
with:
@@ -415,7 +463,7 @@ jobs:
415463
matrix:
416464
compiler: [ g++-10 ]
417465
standard: [ c++14, c++17, c++20 ]
418-
suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, interpolators, autodiff, ../example//examples, ../tools ]
466+
suite: [ github_ci_block_1, github_ci_block_2 ]
419467
steps:
420468
- uses: actions/checkout@v2
421469
with:

test/Jamfile.v2

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1633,4 +1633,11 @@ alias no_eh_tests :
16331633
tools_workaround_incl_test
16341634
;
16351635

1636-
explicit no_eh_tests ;
1636+
explicit no_eh_tests ;
1637+
1638+
# Some aliases which group blocks of tests for CI testing:
1639+
1640+
alias github_ci_block_1 : special_fun float128_tests distribution_tests mp misc ;
1641+
alias github_ci_block_2 : quadrature interpolators autodiff ../example//examples ../tools ;
1642+
explicit github_ci_block_1 ;
1643+
explicit github_ci_block_2 ;

test/multiprc_concept_check_2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ void foo()
3535

3636
int main()
3737
{
38-
BOOST_CONCEPT_ASSERT((boost::math::concepts::RealTypeConcept<test_type>));
38+
boost::math::concepts::RealTypeConcept<test_type> checker;
39+
checker.constraints();
3940
}
4041

4142

test/test_polynomial.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
#define BOOST_TEST_MAIN
88
#include <boost/array.hpp>
99
#include <boost/math/tools/polynomial.hpp>
10+
#ifndef BOOST_MATH_STANDALONE
1011
#include <boost/integer/common_factor_rt.hpp>
12+
#endif
1113
#include <boost/mpl/list.hpp>
1214
#include <boost/mpl/joint_view.hpp>
1315
#include <boost/test/unit_test.hpp>
16+
#ifndef BOOST_MATH_STANDALONE
1417
#include <boost/multiprecision/cpp_int.hpp>
1518
#include <boost/multiprecision/cpp_bin_float.hpp>
1619
#include <boost/multiprecision/cpp_dec_float.hpp>
20+
#endif
1721
#include <utility>
1822
#include <array>
1923
#include <list>
@@ -271,7 +275,7 @@ typedef boost::mpl::list<int, long> large_integral_test_types;
271275
typedef boost::mpl::list<> mp_integral_test_types;
272276
#elif defined(TEST2)
273277
typedef boost::mpl::list<
274-
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
278+
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
275279
boost::multiprecision::cpp_int
276280
#endif
277281
> integral_test_types;
@@ -287,13 +291,13 @@ typedef large_integral_test_types mp_integral_test_types;
287291
typedef boost::mpl::list<double, long double> non_integral_test_types;
288292
#elif defined(TEST2)
289293
typedef boost::mpl::list<
290-
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
294+
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
291295
boost::multiprecision::cpp_rational
292296
#endif
293297
> non_integral_test_types;
294298
#elif defined(TEST3)
295299
typedef boost::mpl::list<
296-
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500)
300+
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1500) && !defined(BOOST_MATH_STANDALONE)
297301
boost::multiprecision::cpp_bin_float_single, boost::multiprecision::cpp_dec_float_50
298302
#endif
299303
> non_integral_test_types;

0 commit comments

Comments
 (0)