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

Jump to bottom

[SON-332] Check gitlab building process for dirty build #327

Merged
merged 2 commits into from
Mar 30, 2020
Merged

[SON-332] Check gitlab building process for dirty build #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fef3b29
Fix failing son test, fix data types and check condition
obucina Mar 30, 2020
19ec668
Very clean build on Gitlab
obucina Mar 30, 2020
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
18 changes: 11 additions & 7 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@ stages:
build:
stage: build
script:
- rm -rf .git/modules/* ./docs ./libraries/fc
- git submodule sync
- git submodule update --init --recursive
- cmake .
- rm -rf build
- mkdir build
- cd build
- cmake ..
- make -j$(nproc)
artifacts:
untracked: true
paths:
- libraries/
- programs/
- tests/
- build/libraries/
- build/programs/
- build/tests/
tags:
- builder

Expand All @@ -26,9 +30,9 @@ test:
dependencies:
- build
script:
- ./tests/betting_test --log_level=message
- ./tests/chain_test --log_level=message
- ./tests/cli_test --log_level=message
- ./build/tests/betting_test --log_level=message
- ./build/tests/chain_test --log_level=message
- ./build/tests/cli_test --log_level=message
tags:
- builder

Expand Down
10 changes: 5 additions & 5 deletions tests/cli/son.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ BOOST_AUTO_TEST_CASE( son_voting )
son_object son2_obj;
signed_transaction vote_son1_tx;
signed_transaction vote_son2_tx;
int son1_start_votes, son1_end_votes;
int son2_start_votes, son2_end_votes;
uint64_t son1_start_votes, son1_end_votes;
uint64_t son2_start_votes, son2_end_votes;

son1_obj = con.wallet_api_ptr->get_son("son1account");
son1_start_votes = son1_obj.total_votes;
Expand Down Expand Up @@ -436,8 +436,8 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )

son_object son1_obj;
son_object son2_obj;
int son1_start_votes, son1_end_votes;
int son2_start_votes, son2_end_votes;
uint64_t son1_start_votes, son1_end_votes;
uint64_t son2_start_votes, son2_end_votes;

// Get votes at start
son1_obj = con.wallet_api_ptr->get_son("son1account");
Expand Down Expand Up @@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
son2_obj = con.wallet_api_ptr->get_son("son2account");
// voice distribution changed, SON2 now has all voices
son2_end_votes = son2_obj.total_votes;
BOOST_CHECK(son2_end_votes > son2_start_votes);
BOOST_CHECK((son2_end_votes > 0) && (son2_end_votes <= son2_start_votes)); // nathan spent funds for vb, it has different voting power
son2_start_votes = son2_end_votes;

// Try to reject incorrect SON
Expand Down