diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index fd0f4ecc27..46b3e34ab8 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -12,12 +12,16 @@ on: inputs: run-tests: required: true - type: boolean + type: string + target_branch: + required: true + type: string env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} + REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} jobs: @@ -33,7 +37,14 @@ jobs: - name: Checkout run: | - git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME . + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . + + - name: Install gcc 10 + run: | + yum install -y centos-release-scl + yum install -y devtoolset-10-gcc* + + - uses: ./.github/workflows/install-cmake-328 - name: Init submodule run: | @@ -59,22 +70,26 @@ jobs: unzip -q ortools.zip rm ortools.zip - - name: Install gcc 10 + - name: Install gh if needed + if: ${{ env.IS_RELEASE == 'true' }} run: | - yum install -y centos-release-scl - yum install -y devtoolset-10-gcc* + yum -y install dnf + dnf -y install 'dnf-command(config-manager)' + dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf -y install gh + - name: Configure run: | source /opt/rh/devtoolset-10/enable - cmake3 -B _build -S src \ + cmake -B _build -S src \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DBUILD_not_system=OFF \ - -DBUILD_TOOLS=OFF \ + -DBUILD_TOOLS=ON \ -DBUILD_UI=OFF \ -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \ @@ -82,18 +97,18 @@ jobs: run: | source /opt/rh/devtoolset-10/enable source /opt/rh/rh-git227/enable - cmake3 --build _build --config Release -j$(nproc) + cmake --build _build --config Release -j$(nproc) ccache -s - name: Installer .rpm creation run: | cd _build - cpack3 -G RPM + cpack -G RPM - name: Solver archive creation run: | cd _build - cmake3 --install . --prefix install + cmake --install . --prefix install pushd . cd install/bin tar czf ../../antares-solver_centos7.tar.gz antares-*-solver libsirius_solver.so @@ -103,7 +118,7 @@ jobs: - name: .tar.gz creation run: | cd _build - cpack3 -G TGZ + cpack -G TGZ - name: Installer TGZ push uses: actions/upload-artifact@v3 @@ -115,14 +130,6 @@ jobs: with: path: _build/*.rpm - - name: Install gh - if: ${{ env.IS_RELEASE == 'true' }} - run: | - yum -y install dnf - dnf -y install 'dnf-command(config-manager)' - dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - dnf -y install gh - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: @@ -131,4 +138,4 @@ jobs: run: | gh release upload "$tag" _build/*.tar.gz _build/*.rpm - \ No newline at end of file + diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index bdb156a776..6cf6da390a 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -3,6 +3,9 @@ name: Create new release on: workflow_dispatch: inputs: + target_branch: + description: "Target branch or full commit SHA" + required: true release_tag: description: "Release tag" required: true @@ -12,6 +15,11 @@ on: run-tests: description: "Run all tests (true/false)" required: true + type: string + set_latest: + description: "Set the release as latest" + required: true + type: boolean jobs: release: name: Release pushed tag @@ -23,12 +31,15 @@ jobs: tag: ${{ github.event.inputs.release_tag }} title: ${{ github.event.inputs.release_name }} tests: ${{ github.event.inputs.run-tests }} + target_branch: ${{ github.event.inputs.target_branch }} + latest: ${{ github.event.inputs.set_latest }} run: | gh release create "$tag" \ --repo="$GITHUB_REPOSITORY" \ --title="$title" \ - --notes="Run tests: $tests" - + --notes="Run tests: $tests"\ + --target="$target_branch" \ + --latest=$latest ubuntu: @@ -36,32 +47,36 @@ jobs: needs: release uses: ./.github/workflows/ubuntu.yml with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + run-tests: ${{ inputs.run-tests }} + target_branch: ${{ inputs.target_branch }} windows: name: Release - Windows needs: release uses: ./.github/workflows/windows-vcpkg.yml with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + run-tests: ${{ inputs.run-tests }} + target_branch: ${{ inputs.target_branch }} centos7: name: Release - centos7 needs: release uses: ./.github/workflows/centos7.yml with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + run-tests: ${{ inputs.run-tests }} + target_branch: ${{ inputs.target_branch }} oracle8: name: Release - oracle8 needs: release uses: ./.github/workflows/oracle8.yml with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + run-tests: ${{ inputs.run-tests }} + target_branch: ${{ inputs.target_branch }} user_guide: name: User Guide needs: release uses: ./.github/workflows/build-userguide.yml with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + run-tests: ${{ inputs.run-tests }} diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 10e94ddb92..76009b7d65 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -6,25 +6,32 @@ on: push: branches: - develop + - dependabot/* + schedule: - cron: '21 2 * * *' workflow_call: inputs: run-tests: required: true - type: boolean + type: string + target_branch: + required: true + type: string env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} + REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} + jobs: build: name: Build env: - ORTOOLSDIR: ${{ github.workspace }}/or-tools + ORTOOLS_DIR: ${{ github.workspace }}/or-tools runs-on: ubuntu-latest container: 'oraclelinux:8' @@ -38,12 +45,24 @@ jobs: - name: Install libraries run: | - dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core - dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-10-toolchain zlib-devel + dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core + dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-11 zlib-devel - name: Checkout run: | - git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME . + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . + + - name: Config OR-Tools URL + run: | + echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV + + - name: Download & extract OR-Tools + run: | + mkdir -p ${{env.ORTOOLS_DIR}} + cd ${{env.ORTOOLS_DIR}} + wget ${{env.ORTOOLS_URL}} -O ortools.zip + unzip ortools.zip + rm ortools.zip - name: Init submodule run: | @@ -54,18 +73,26 @@ jobs: run: | pip3 install -r src/tests/examples/requirements.txt + - name: Install gh if needed + if: ${{ env.IS_RELEASE == 'true' }} + run: | + dnf -y install 'dnf-command(config-manager)' + dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf -y install gh + - name: Configure run: | - source /opt/rh/gcc-toolset-10/enable + source /opt/rh/gcc-toolset-11/enable cmake -B _build -S src \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=ON \ - -DBUILD_TOOLS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_TOOLS=ON \ -DBUILD_UI=OFF \ + -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install - name: Build run: | - source /opt/rh/gcc-toolset-10/enable + source /opt/rh/gcc-toolset-11/enable cmake --build _build --config Release -j$(nproc) - name: Run unit and end-to-end tests @@ -104,18 +131,10 @@ jobs: with: path: _build/*.rpm - - name: Install gh - if: ${{ env.IS_RELEASE == 'true' }} - run: | - dnf -y install 'dnf-command(config-manager)' - dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - dnf -y install gh - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" _build/*.tar.gz _build/*.rpm - + gh release upload "$tag" _build/*.tar.gz _build/*.rpm diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f85572cdbc..d961d2e5a0 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -10,19 +10,28 @@ on: - issue-* - release/* - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: inputs: run-tests: required: true - type: boolean + type: string + target_branch: + required: true + type: string env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} + VCPKG_ROOT: ${{ github.workspace }}/vcpkg + vcpkgPackages: yaml-cpp antlr4 + triplet: x64-linux + WX_CONFIG: /usr/bin/wx-config jobs: @@ -34,15 +43,39 @@ jobs: runs-on: ubuntu-20.04 if: "!contains(github.event.head_commit.message, '[skip ci]')" - + steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + ref: ${{ env.REF }} - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ env.os }} + + - name : Init VCPKG submodule + run: | + git submodule update --init vcpkg + + # Restore both vcpkg and its artifacts from the GitHub cache service. + - name: Restore vcpkg and its artifacts. + uses: actions/cache@v4 + with: + # The first path is the location of vcpkg (it contains the vcpkg executable and data files). + # The other paths starting with '!' are exclusions: they contain termporary files generated during the build of the installed packages. + path: | + ${{ env.VCPKG_ROOT }} + !${{ env.VCPKG_ROOT }}/buildtrees + !${{ env.VCPKG_ROOT }}/packages + !${{ env.VCPKG_ROOT }}/downloads + # The key is composed in a way that it gets properly invalidated: this must happen whenever vcpkg's Git commit id changes, or the list of packages changes. In this case a cache miss must happen and a new entry with a new key with be pushed to GitHub the cache service. + # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm. + # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already). + key: | + ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }} + - name: Install libraries run: | sudo apt-get update @@ -50,6 +83,19 @@ jobs: sudo apt-get install libboost-test-dev sudo apt-get install g++-10 gcc-10 + - name: export wxWidgets script + shell: bash + run: | + export WX_CONFIG=${{env.WX_CONFIG}} + + - name : Install deps with VCPKG + run: | + cd vcpkg + ./bootstrap-vcpkg.sh + vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}} + rm -rf buildtrees packages downloads + shell: bash + - name: Read antares-deps version id: antares-deps-version uses: notiz-dev/github-action-json-property@release @@ -72,7 +118,7 @@ jobs: - name: Set up Python id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.12' @@ -85,11 +131,15 @@ jobs: run: | git submodule update --init src/antares-deps git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests + + - name: Configure run: | cmake -B _build -S src \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ + -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ @@ -138,7 +188,7 @@ jobs: - name: Upload logs for failed tests if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-log path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log @@ -262,20 +312,22 @@ jobs: rm -rf install - name: Installer archive upload push - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: targz path: _build/*.tar.gz - name: Installer deb upload push - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: deb path: _build/*.deb - - + + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" _build/*.tar.gz _build/*.deb + gh release upload "$tag" _build/*.tar.gz _build/*.deb diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 0378a8f074..d0ddf76fe9 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -10,19 +10,24 @@ on: - issue-* - release/* - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: inputs: run-tests: required: true - type: boolean + type: string + target_branch: + required: true + type: string env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} jobs: @@ -32,16 +37,18 @@ jobs: # Indicates the location of the vcpkg as a Git submodule of the project repository. VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools - RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} os: windows-latest test-platform: windows-2022 - vcpkgPackages: wxwidgets boost-test + vcpkgPackages: wxwidgets boost-test yaml-cpp antlr4 triplet: x64-windows runs-on: windows-latest steps: - - uses: actions/checkout@v3 + + - uses: actions/checkout@v4 + with: + ref: ${{ env.REF }} - name: Config OR-Tools URL run: | @@ -77,10 +84,10 @@ jobs: # Restore both vcpkg and its artifacts from the GitHub cache service. - name: Restore vcpkg and its artifacts. - uses: actions/cache@v3 + uses: actions/cache@v4 with: # The first path is the location of vcpkg (it contains the vcpkg executable and data files). - # The other paths starting with '!' are exclusions: they contain termporary files generated during the build of the installed packages. + # The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages. path: | ${{ env.VCPKG_ROOT }} !${{ env.VCPKG_ROOT }}/buildtrees @@ -116,7 +123,7 @@ jobs: ortools-dir: ${{env.ORTOOLS_DIR}} - name: Setup Python 3.12 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 id: setup-python with: architecture: 'x64' @@ -151,7 +158,7 @@ jobs: - name: Build shell: bash run: | - cmake --build _build --config Release -j2 + cmake --build _build --config Release -j$(nproc) # simtest - name: Read simtest version id: simtest-version @@ -183,7 +190,7 @@ jobs: - name: Upload build on failure if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: MPS-diff path: ${{ github.workspace }}/src/tests/mps @@ -304,7 +311,7 @@ jobs: - name: Upload NSIS log on failure if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: NSISError.log path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log @@ -315,8 +322,9 @@ jobs: cpack -G ZIP - name: Installer upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: installer path: _build/${{env.NSIS_NAME}} - name: Publish assets @@ -325,5 +333,5 @@ jobs: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" _build/*.zip + gh release upload "$tag" _build/*.zip _build/*.exe shell: bash diff --git a/simtest.json b/simtest.json index 570b89427c..f6ff4822c4 100644 --- a/simtest.json +++ b/simtest.json @@ -1,3 +1,3 @@ { - "version": "v8.8.2" + "version": "v8.8.5" } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e39ee204e9..73069669f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) # FetchContent_MakeAvailable # Version set(ANTARES_VERSION_HI 8) set(ANTARES_VERSION_LO 8) -set(ANTARES_VERSION_REVISION 4) +set(ANTARES_VERSION_REVISION 5) # Beta release set(ANTARES_BETA 0) diff --git a/src/ext/yuni/src/yuni/io/filename-manipulation.cpp b/src/ext/yuni/src/yuni/io/filename-manipulation.cpp index e65caeced1..2a1665fe8b 100644 --- a/src/ext/yuni/src/yuni/io/filename-manipulation.cpp +++ b/src/ext/yuni/src/yuni/io/filename-manipulation.cpp @@ -300,7 +300,7 @@ void parentPath(String& out, const AnyString& path, bool systemDependant) } template -static inline void parentPath(StringT& out, const AnyString& path, bool systemDependant) +static inline void ExtractFileNameImpl(StringT& out, const AnyString& path, bool systemDependant) { AnyString::size_type pos = (systemDependant) ? path.find_last_of(IO::Constant::Separator) @@ -313,12 +313,12 @@ static inline void parentPath(StringT& out, const AnyString& path, bool systemDe void ExtractFileName(String& out, const AnyString& path, bool systemDependant) { - parentPath(out, path, systemDependant); + ExtractFileNameImpl(out, path, systemDependant); } void ExtractFileName(Clob& out, const AnyString& path, bool systemDependant) { - parentPath(out, path, systemDependant); + ExtractFileNameImpl(out, path, systemDependant); } template diff --git a/src/solver/variable/economy/profitByPlant.h b/src/solver/variable/economy/profitByPlant.h index 02a471fab8..373237978e 100644 --- a/src/solver/variable/economy/profitByPlant.h +++ b/src/solver/variable/economy/profitByPlant.h @@ -277,12 +277,11 @@ class ProfitByPlant : public Variable::IVariable, NextT, VC auto* cluster = state.area->thermal.clusters[clusterIndex]; double hourlyClusterProduction = thermal[area->index].thermalClustersProductions[clusterIndex]; - double pMin = thermal[area->index].PMinOfClusters[clusterIndex]; uint tsIndex = cluster->series.timeseriesNumbers[0][state.year]; // Thermal cluster profit pValuesForTheCurrentYear[numSpace][cluster->areaWideIndex].hour[hourInTheYear] - = (hourlyClusterProduction - pMin) + = std::max((hourlyClusterProduction - cluster->PthetaInf[hourInTheYear]), 0.) * (-areaMarginalCosts[hourInTheWeek] - cluster->getMarginalCost(tsIndex, hourInTheYear)); } diff --git a/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp b/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp index 16c3a9046d..083c8f863a 100644 --- a/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp +++ b/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test-end-to-end tests_binding_constraints -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN #include #include diff --git a/src/tests/end-to-end/simple_study/simple-study.cpp b/src/tests/end-to-end/simple_study/simple-study.cpp index a36c3fe6ab..e422c05d9d 100644 --- a/src/tests/end-to-end/simple_study/simple-study.cpp +++ b/src/tests/end-to-end/simple_study/simple-study.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test-end-to-end tests -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/libs/antares/array/tests-matrix-load.cpp b/src/tests/src/libs/antares/array/tests-matrix-load.cpp index 31a209c67b..dd3a43f915 100644 --- a/src/tests/src/libs/antares/array/tests-matrix-load.cpp +++ b/src/tests/src/libs/antares/array/tests-matrix-load.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test-lib-antares-matrix tests -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/array/tests-matrix-save.cpp b/src/tests/src/libs/antares/array/tests-matrix-save.cpp index b01ac3ef17..e672962651 100644 --- a/src/tests/src/libs/antares/array/tests-matrix-save.cpp +++ b/src/tests/src/libs/antares/array/tests-matrix-save.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test-lib-antares-matrix tests -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/concurrency/test_concurrency.cpp b/src/tests/src/libs/antares/concurrency/test_concurrency.cpp index 1ab2119889..72ca263cff 100644 --- a/src/tests/src/libs/antares/concurrency/test_concurrency.cpp +++ b/src/tests/src/libs/antares/concurrency/test_concurrency.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ #define BOOST_TEST_MODULE test-concurrency tests -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp b/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp index 0e3f4163d4..4119915bc9 100644 --- a/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp +++ b/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test save area optimization.ini -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp b/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp index 584b0d2861..b774013a10 100644 --- a/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp +++ b/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test save link properties.ini -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/constraint/test_constraint.cpp b/src/tests/src/libs/antares/study/constraint/test_constraint.cpp index a671d7857c..adc80328de 100644 --- a/src/tests/src/libs/antares/study/constraint/test_constraint.cpp +++ b/src/tests/src/libs/antares/study/constraint/test_constraint.cpp @@ -4,7 +4,7 @@ #define WIN32_LEAN_AND_MEAN #define BOOST_TEST_MODULE binding_constraints -#define BOOST_TEST_DYN_LINK + #include diff --git a/src/tests/src/libs/antares/study/constraint/test_group.cpp b/src/tests/src/libs/antares/study/constraint/test_group.cpp index c53f3c855d..2f732eaa5d 100644 --- a/src/tests/src/libs/antares/study/constraint/test_group.cpp +++ b/src/tests/src/libs/antares/study/constraint/test_group.cpp @@ -2,7 +2,7 @@ // Created by marechaljas on 28/06/23. // #define BOOST_TEST_MODULE binding_constraints_groups -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN #include #include diff --git a/src/tests/src/libs/antares/study/output-folder/study.cpp b/src/tests/src/libs/antares/study/output-folder/study.cpp index f4df8e3e00..281dba2eee 100644 --- a/src/tests/src/libs/antares/study/output-folder/study.cpp +++ b/src/tests/src/libs/antares/study/output-folder/study.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE output folder -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp index 03fca5f5d9..4fef1b9660 100644 --- a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp +++ b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test read scenario-builder.dat -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp index db422282dc..a91d0732d1 100644 --- a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp +++ b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test save scenario - builder.dat -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/libs/antares/study/series/timeseries-tests.cpp b/src/tests/src/libs/antares/study/series/timeseries-tests.cpp index b5e2fadeed..69abdbc00c 100644 --- a/src/tests/src/libs/antares/study/series/timeseries-tests.cpp +++ b/src/tests/src/libs/antares/study/series/timeseries-tests.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE "test time series" -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp b/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp index fa73cc6306..d6a51bce85 100644 --- a/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp +++ b/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE "test short term storage" -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/test_study.cpp b/src/tests/src/libs/antares/study/test_study.cpp index f934754ce5..55044c3762 100644 --- a/src/tests/src/libs/antares/study/test_study.cpp +++ b/src/tests/src/libs/antares/study/test_study.cpp @@ -26,7 +26,7 @@ */ #define BOOST_TEST_MODULE study -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN #include diff --git a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp index cbd8895d80..285135f484 100644 --- a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp +++ b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE "test thermal price definition" -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/test_utils.cpp b/src/tests/src/libs/antares/test_utils.cpp index d6de5507a2..fc13941459 100644 --- a/src/tests/src/libs/antares/test_utils.cpp +++ b/src/tests/src/libs/antares/test_utils.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test utils -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/libs/antares/writer/test_zip_writer.cpp b/src/tests/src/libs/antares/writer/test_zip_writer.cpp index c934b0d316..efe98e994b 100644 --- a/src/tests/src/libs/antares/writer/test_zip_writer.cpp +++ b/src/tests/src/libs/antares/writer/test_zip_writer.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ #define BOOST_TEST_MODULE test-writer tests -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp b/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp index 0ae7bba823..352dbbc520 100644 --- a/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp +++ b/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp @@ -26,7 +26,7 @@ */ #define WIN32_LEAN_AND_MEAN #define BOOST_TEST_MODULE unfeasible_problem_analyzer -#define BOOST_TEST_DYN_LINK + #include #include diff --git a/src/tests/src/solver/optimisation/adequacy_patch.cpp b/src/tests/src/solver/optimisation/adequacy_patch.cpp index f9101143a5..57a8f4cea8 100644 --- a/src/tests/src/solver/optimisation/adequacy_patch.cpp +++ b/src/tests/src/solver/optimisation/adequacy_patch.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test adequacy patch functions -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/solver/simulation/test-store-timeseries-number.cpp b/src/tests/src/solver/simulation/test-store-timeseries-number.cpp index 43948da1a8..f92628e3cc 100644 --- a/src/tests/src/solver/simulation/test-store-timeseries-number.cpp +++ b/src/tests/src/solver/simulation/test-store-timeseries-number.cpp @@ -2,7 +2,7 @@ // Created by marechaljas on 15/03/23. // #define BOOST_TEST_MODULE store-timeseries-number -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/solver/simulation/test-time_series.cpp b/src/tests/src/solver/simulation/test-time_series.cpp index 00357c5299..a040f1a7c3 100644 --- a/src/tests/src/solver/simulation/test-time_series.cpp +++ b/src/tests/src/solver/simulation/test-time_series.cpp @@ -2,7 +2,7 @@ // Created by marechaljas on 07/04/23. // #define BOOST_TEST_MODULE rhsTimeSeries -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN #include diff --git a/src/tests/src/solver/simulation/tests-ts-numbers.cpp b/src/tests/src/solver/simulation/tests-ts-numbers.cpp index c12bf028dd..167025a242 100644 --- a/src/tests/src/solver/simulation/tests-ts-numbers.cpp +++ b/src/tests/src/solver/simulation/tests-ts-numbers.cpp @@ -1,5 +1,5 @@ #define BOOST_TEST_MODULE test solver simulation things -#define BOOST_TEST_DYN_LINK + #define WIN32_LEAN_AND_MEAN