Skip to content

Commit 92c101d

Browse files
committed
Trying to adjust Makefile & github actions for MacOS testing.
1 parent 0ac6197 commit 92c101d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/macos-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
run: git submodule update --init --recursive
4343
- name: Build pcsx-redux
4444
run: make -j2
45+
- name: Build pcsx-redux
46+
run: make -j2 pcsx-redux-tests
4547
- name: Download OpenBIOS build
4648
uses: actions/download-artifact@v2
4749
with:

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ clean:
211211
gtest-all.o: $(wildcard third_party/googletest/googletest/src/*.cc)
212212
$(CXX) -O3 -g $(CXXFLAGS) -Ithird_party/googletest/googletest -Ithird_party/googletest/googletest/include -c third_party/googletest/googletest/src/gtest-all.cc
213213

214+
gtest_main.o: third_party/googletest/googletest/src/gtest_main.cc
215+
$(CXX) -O3 -g $(CXXFLAGS) -Ithird_party/googletest/googletest -Ithird_party/googletest/googletest/include -c third_party/googletest/googletest/src/gtest_main.cc
216+
214217
gitclean:
215218
git clean -f -d -x
216219
git submodule foreach --recursive git clean -f -d -x
@@ -225,8 +228,8 @@ regen-i18n:
225228
rm pcsx-src-list.txt
226229
$(foreach l,$(LOCALES),$(call msgmerge,$(l)))
227230

228-
pcsx-redux-tests: $(foreach t,$(TESTS),$(t).o) $(NONMAIN_OBJECTS) gtest-all.o
229-
$(LD) -o pcsx-redux-tests $(NONMAIN_OBJECTS) gtest-all.o $(foreach t,$(TESTS),$(t).o) -Ithird_party/googletest/googletest/include third_party/googletest/googletest/src/gtest_main.cc $(LDFLAGS)
231+
pcsx-redux-tests: $(foreach t,$(TESTS),$(t).o) $(NONMAIN_OBJECTS) gtest-all.o gtest_main.o
232+
$(LD) -o pcsx-redux-tests gtest_main.o $(NONMAIN_OBJECTS) gtest-all.o $(foreach t,$(TESTS),$(t).o) $(LDFLAGS)
230233

231234
runtests: pcsx-redux-tests
232235
./pcsx-redux-tests

0 commit comments

Comments
 (0)