Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/update tests #763

Merged
merged 5 commits into from
Oct 14, 2024
Merged

fix/update tests #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da97bf3
fix pip enviroment.
MFraters Oct 13, 2024
eda972b
add -fprofile-update=atomic flag to coverage.
MFraters Oct 13, 2024
2527ce2
fix benchmarks
MFraters Oct 13, 2024
76aba9d
fix draft paper test
MFraters Oct 13, 2024
dd3b08a
fix spelling of truncation.
MFraters Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
cat ${{github.workspace}}/result_${{matrix.benchmark_number}}.csv | cargo run --release analyze --disable-dynamic-printing > ${{github.workspace}}/benchmark_${{matrix.benchmark_number}}_results/analyze_${{matrix.benchmark_number}}.log ||:;
cat ${{github.workspace}}/benchmark_${{matrix.benchmark_number}}_results/analyze_${{matrix.benchmark_number}}.log

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: benchmark_${{matrix.benchmark_number}}_results
path: benchmark_${{matrix.benchmark_number}}_results/
2 changes: 1 addition & 1 deletion .github/workflows/draft-pdf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# This should be the path to the paper within your repo.
paper-path: doc/JOSS/1.0/paper.md
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: paper
# This is the output path where Pandoc will write the compiled
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ jobs:
run: echo $PATH && export PATH=$PATH:/home/runner/.local/bin && echo $PATH && export PYTHONPATH=$PYTHONPATH:/home/runner/.local/bin

- name: Install coveralls
run: pip install --user cpp-coveralls
run: pipx install cpp-coveralls
shell: bash

- name: Create Build Environment
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ SET(FORCE_COLORED_OUTPUT ON CACHE BOOL "Forces colored output when compiling wit

IF ( CMAKE_BUILD_TYPE STREQUAL Coverage )
SET(CMAKE_VERBOSE_MAKEFILE on )
SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_NEW --coverage -fprofile-arcs -ftest-coverage -g)
SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_OLD "--coverage -fprofile-arcs -ftest-coverage -g")
SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_NEW --coverage -fprofile-arcs -ftest-coverage -g -fprofile-update=atomic)
SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_OLD "--coverage -fprofile-arcs -ftest-coverage -g -fprofile-update=atomic")

## for old versions of cmake
SET(WB_FORTRAN_COMPILER_FLAGS_COVERAGE "--coverage")
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/unit_test_world_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3473,10 +3473,10 @@ TEST_CASE("WorldBuilder Types: Segment Object")
{
#define TYPE Segment
const WorldBuilder::Point<2> thickness(1,2,invalid);
const WorldBuilder::Point<2> top_trucation(3,4,invalid);
const WorldBuilder::Point<2> top_truncation(3,4,invalid);
const WorldBuilder::Point<2> angle(5,6,invalid);
Objects::TYPE<Features::FaultModels::Temperature::Interface, Features::FaultModels::Composition::Interface, Features::FaultModels::Grains::Interface>
type (1.0, thickness, top_trucation, angle,
type (1.0, thickness, top_truncation, angle,
std::vector<std::shared_ptr<Features::FaultModels::Temperature::Interface> >(),
std::vector<std::shared_ptr<Features::FaultModels::Composition::Interface> >(),
std::vector<std::shared_ptr<Features::FaultModels::Grains::Interface> >());
Expand Down
Loading