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

Plugin: Tests/catch2 upgraded to 3.5.3 #190

Merged
merged 2 commits into from
May 13, 2024
Merged

Plugin: Tests/catch2 upgraded to 3.5.3 #190

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
f228464
Plugin: Tests/catch2 upgraded to 3.5.3
hbeni May 13, 2024
7786c55
Plugin: Fix MacOS Build and test errors
hbeni May 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
4 changes: 2 additions & 2 deletions .github/workflows/make-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Build and run CATCH2 tests
run: |
make -C client/mumble-plugin/ CC=g++-11 test
make -C client/mumble-plugin/ CC=g++-13 CFLAGS+=-ld_classic test

- name: Build Plugin
run: |
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:

- name: Build and run CATCH2 tests
run: |
make -C client/mumble-plugin/ DEBUG+="-g3 -Og -DDEBUG" CC=g++-11 test
make -C client/mumble-plugin/ DEBUG+="-g3 -Og -DDEBUG" CC=g++-13 CFLAGS+=-ld_classic test

- name: Build Plugin
run: |
Expand Down
6 changes: 3 additions & 3 deletions client/mumble-plugin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ test: libs test/catch2/tests-main.o test/catch2/tests-main.o test/catch2/radioMo

# clean compile results
clean:
rm -f *.o *.rc lib/*.o test/catch2/*.catch2
rm -f *.o *.rc lib/*.o test/catch2/*.catch2 test/catch2/*.o

# clean compile results and binarys
clean-all: clean
Expand Down Expand Up @@ -151,10 +151,10 @@ plugin-win-dllresource:
$(mingwprefix)windres dllResource.rc dllResource.o

# shortcut for building natively on macOS
plugin-macOS: CC=g++-11
plugin-macOS: CC=g++-13
plugin-macOS: outname=fgcom-mumble-macOS.bundle
plugin-macOS: openssl-macOS
make CC=$(CC) outname=$(outname) plugin
make CC=$(CC) outname=$(outname) CFLAGS+=-ld_classic plugin

# OpenSSL
# The sources are located under lib/openssl as git submodule, and supposed to point to the latest stable head
Expand Down
Loading
Loading