From d2e0b6d82a4058036bcefaa378ca4fdff7be8860 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 17 Jun 2024 21:28:16 +0300 Subject: [PATCH 1/2] Update ci.yml --- .github/workflows/ci.yml | 57 ++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8b8921..e0e5665 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,23 +19,23 @@ jobs: include: - toolset: gcc-4.8 cxxstd: "03,11" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-4.8 - toolset: gcc-5 cxxstd: "03,11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-5 - toolset: gcc-6 cxxstd: "03,11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-6 - toolset: gcc-7 cxxstd: "03,11,14,17" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest - toolset: gcc-8 cxxstd: "03,11,14,17,2a" os: ubuntu-20.04 @@ -56,26 +56,31 @@ jobs: install: g++-12 - toolset: gcc-13 cxxstd: "03,11,14,17,20,2b" - os: ubuntu-latest container: ubuntu:23.04 + os: ubuntu-latest install: g++-13 + - toolset: gcc-14 + cxxstd: "03,11,14,17,20,2b" + container: ubuntu:24.04 + os: ubuntu-latest + install: g++-14 - toolset: clang compiler: clang++-3.9 cxxstd: "03,11,14" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-3.9 - toolset: clang compiler: clang++-4.0 cxxstd: "03,11,14" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-4.0 - toolset: clang compiler: clang++-5.0 cxxstd: "03,11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-5.0 - toolset: clang compiler: clang++-6.0 @@ -133,24 +138,30 @@ jobs: - toolset: clang compiler: clang++-16 cxxstd: "03,11,14,17,20,2b" - os: ubuntu-latest container: ubuntu:23.04 + os: ubuntu-latest install: clang-16 - toolset: clang compiler: clang++-17 cxxstd: "03,11,14,17,20,2b" - os: ubuntu-latest container: ubuntu:23.10 + os: ubuntu-latest install: clang-17 - toolset: clang - cxxstd: "03,11,14,17,2a" - os: macos-11 + compiler: clang++-18 + cxxstd: "03,11,14,17,20,2b" + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-18 - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-12 - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-13 + - toolset: clang + cxxstd: "03,11,14,17,20,2b" + os: macos-14 runs-on: ${{matrix.os}} container: ${{matrix.container}} @@ -224,7 +235,7 @@ jobs: addrmd: 32,64 os: windows-2022 - toolset: clang-win - cxxstd: "14,17,latest" + cxxstd: "14,17,20,latest" addrmd: 32,64 os: windows-2022 - toolset: gcc @@ -235,7 +246,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Boost shell: cmd @@ -272,14 +283,14 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install packages if: matrix.install @@ -320,14 +331,14 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install packages if: matrix.install @@ -378,14 +389,14 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install packages if: matrix.install @@ -438,7 +449,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Boost shell: cmd @@ -487,7 +498,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Boost shell: cmd @@ -554,7 +565,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Boost shell: cmd From 6ff2e5dca53fc50bef54ef3eeaaed83d35cbc061 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 17 Jun 2024 21:52:29 +0300 Subject: [PATCH 2/2] Update throw_exception_test4.cpp --- test/throw_exception_test4.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/throw_exception_test4.cpp b/test/throw_exception_test4.cpp index 69be7d2..cc36c2f 100644 --- a/test/throw_exception_test4.cpp +++ b/test/throw_exception_test4.cpp @@ -24,8 +24,9 @@ class my_exception3: public std::exception, public virtual boost::exception char const* translate_function( char const * fn, char const * cfn ) { - // translate "" and "main" to BOOST_CURRENT_FUNCTION - return fn[0] == 0 || std::strcmp( fn, "main" ) == 0? cfn: fn; + // fn comes from BOOST_CURRENT_LOCATION, which is not necessarily the same as BOOST_CURRENT_FUNCTION + // so translate the known problematic cases to BOOST_CURRENT_FUNCTION to make the test pass + return fn[0] == 0 || std::strcmp( fn, "main" ) == 0 || std::strcmp( fn, "int __cdecl main(void)" ) == 0? cfn: fn; } static char const* adjust_filename( char const* file ) @@ -61,7 +62,7 @@ int main() int const * line = boost::get_error_info( x ); BOOST_TEST( line != 0 ); - BOOST_TEST_EQ( *line, 49 ); + BOOST_TEST_EQ( *line, 50 ); } { @@ -89,7 +90,7 @@ int main() int const * line = boost::get_error_info( x ); BOOST_TEST( line != 0 ); - BOOST_TEST_EQ( *line, 77 ); + BOOST_TEST_EQ( *line, 78 ); } { @@ -117,7 +118,7 @@ int main() int const * line = boost::get_error_info( x ); BOOST_TEST( line != 0 ); - BOOST_TEST_EQ( *line, 105 ); + BOOST_TEST_EQ( *line, 106 ); } {