Skip to content

Commit ccea2a0

Browse files
committed
brew path
1 parent 9076969 commit ccea2a0

File tree

1 file changed

+3
-26
lines changed

1 file changed

+3
-26
lines changed

.github/workflows/os_test.yml

+3-26
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ jobs:
4040
run: |
4141
brew install libomp llvm
4242
# Dynamic paths for Homebrew-installed tools
43-
- name: Set up LLVM and environment
44-
run: |
45-
echo "Adding LLVM to path"
46-
export PATH="$(brew --prefix llvm)/bin:$PATH"
47-
which clang
48-
which clang++
4943
5044
- name: Install Python dependencies and build the project
5145
run: |
@@ -59,7 +53,7 @@ jobs:
5953
export CPPFLAGS="-I${LIBOMP_PREFIX}/include -I${LLVM_PREFIX}/include"
6054
export CC="$(brew --prefix llvm)/bin/clang"
6155
export CXX="$(brew --prefix llvm)/bin/clang++"
62-
export PATH="${LLVM_PREFIX}/bin:$PATH"
56+
export PATH="${BREW_PREFIX}/bin:${LLVM_PREFIX}/bin:$PATH"
6357
export DYLD_LIBRARY_PATH="${LLVM_PREFIX}/lib:${LIBOMP_PREFIX}/lib:$DYLD_LIBRARY_PATH"
6458
DEBUG=1 pip install . -v
6559
@@ -75,24 +69,7 @@ jobs:
7569
7670
# Inspect the linked libraries
7771
otool -L $module_file
78-
- name: Run tests under lldb
79-
continue-on-error: true
80-
run: |
81-
BREW_PREFIX=$(brew --prefix)
82-
LLVM_PREFIX=$(brew --prefix llvm)
83-
LIBOMP_PREFIX=$(brew --prefix libomp)
84-
echo $LIBOMP_PREFIX
85-
86-
export LDFLAGS="-L${LIBOMP_PREFIX}/lib -L${LLVM_PREFIX}/lib -L${LLVM_PREFIX}/lib/c++ -Wl,-rpath,${LLVM_PREFIX}/lib/c++"
87-
export CPPFLAGS="-I${LIBOMP_PREFIX}/include -I${LLVM_PREFIX}/include"
88-
export CC="$(brew --prefix llvm)/bin/clang"
89-
export CXX="$(brew --prefix llvm)/bin/clang++"
90-
export PATH="${LLVM_PREFIX}/bin:$PATH"
91-
export DYLD_LIBRARY_PATH="${LLVM_PREFIX}/lib:${LIBOMP_PREFIX}/lib:$DYLD_LIBRARY_PATH"
92-
lldb python << EOF
93-
run -m unittest discover tests > test_output.log 2>&1
94-
EOF
95-
cat test_output.log
72+
9673
- name: Run tests
9774
run: |
9875
export UNWIND_NO_UNWIND=1
@@ -105,7 +82,7 @@ jobs:
10582
export CPPFLAGS="-I${LIBOMP_PREFIX}/include -I${LLVM_PREFIX}/include"
10683
export CC="$(brew --prefix llvm)/bin/clang"
10784
export CXX="$(brew --prefix llvm)/bin/clang++"
108-
export PATH="${LLVM_PREFIX}/bin:$PATH"
85+
export PATH="${BREW_PREFIX}/bin:${LLVM_PREFIX}/bin:$PATH"
10986
export DYLD_LIBRARY_PATH="${LLVM_PREFIX}/lib:${LIBOMP_PREFIX}/lib:$DYLD_LIBRARY_PATH"
11087
python -m unittest discover tests
11188
# lldb -- python -m unittest discover tests

0 commit comments

Comments
 (0)