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

Run MacOS tests in correct directory. #3718

Merged
merged 6 commits into from
Dec 16, 2022
Merged

Run MacOS tests in correct directory. #3718

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bc920d
Run MacOS tests in correct directory.
fruffy Nov 22, 2022
4e567df
Add coreutils to Mac dependencies.
fruffy Nov 23, 2022
641d708
Add grep to Mac dependencies.
fruffy Nov 23, 2022
2673b88
Brew grep.
fruffy Nov 27, 2022
a4381b8
Ignore gtest.
fruffy Dec 12, 2022
6725e14
Drop.
fruffy Dec 15, 2022
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
4 changes: 3 additions & 1 deletion .github/workflows/ci-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,7 @@ jobs:
./bootstrap.sh -DENABLE_GC=ON -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_UNIFIED_COMPILATION=ON && cd build && make -j2

- name: Run tests (MacOS)
# TODO: Renable gtest. Unit tests currently fail on MacOS.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fruffy Would you be able to open a GitHub issue describing the problem and add a link in the comment, or we could add a link to this pull request?

run: |
ctest --output-on-failure -j 2 --schedule-random -LE "bpf$"
ctest --output-on-failure -j 2 --schedule-random -LE "bpf|gtest|ubpf"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop -j2.

CTEST_PARALLEL_LEVEL is defined.

working-directory: ./build
8 changes: 5 additions & 3 deletions tools/install_mac_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ fi

$BREW update
$BREW install autoconf automake bdw-gc bison boost ccache cmake \
libtool openssl pkg-config python
libtool openssl pkg-config python coreutils grep
$BREW install protobuf

# Prefer Homebrew's bison over the macOS-provided version
$BREW link --force bison
# Prefer Homebrew's bison and grep over the macOS-provided version
$BREW link --force bison grep
echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
echo 'export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"' >> ~/.bash_profile
export PATH="/usr/local/opt/bison/bin:$PATH"
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"

# install pip and required pip packages
# curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
Expand Down