<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/56fbdbae43b57302851a5be69e0f6011c98a87ea">https://github.com/macports/macports-legacy-support/commit/56fbdbae43b57302851a5be69e0f6011c98a87ea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56fbdbae43b57302851a5be69e0f6011c98a87ea
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Oct 6 16:59:12 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> Support C++ manual tests
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unlike the C manual tests, these use the library as usual, but are
</span><span style='display:block; white-space:pre;color:#404040;'> made manual due to recent stricter compiler/SDK requirements for
</span><span style='display:block; white-space:pre;color:#404040;'> successful C++ builds. Keeping C++ tests out of the normal automatic
</span><span style='display:block; white-space:pre;color:#404040;'> test suite allows success on the full range of compilers and SDKs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> The C++ tests are now run when specified explicitly.
</span>---
Makefile | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7d7024..d641234 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,10 +137,14 @@ MANTESTPREFIX = $(MANTESTDIR)/
</span> MANRUNPREFIX = mantest_
MANTESTLDFLAGS = $(ALLLDFLAGS)
MANTESTSRCS_C := $(wildcard $(MANTESTPREFIX)*.c)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+MANTESTSRCS_CPP := $(wildcard $(MANTESTPREFIX)*.cpp)
</span> MANTESTOBJS_C := $(patsubst %.c,%.o,$(MANTESTSRCS_C))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+MANTESTOBJS_CPP := $(patsubst %.cpp,%.o,$(MANTESTSRCS_CPP))
</span> MANTESTPRGS_C := $(patsubst %.c,%,$(MANTESTSRCS_C))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+MANTESTPRGS_CPP := $(patsubst %.cpp,%,$(MANTESTSRCS_CPP))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MANTESTPRGS = $(MANTESTPRGS_C) $(MANTESTPRGS_CPP)
</span> MANTESTRUNS := $(patsubst \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MANTESTPREFIX)%,$(MANRUNPREFIX)%,$(MANTESTPRGS_C))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MANTESTPREFIX)%,$(MANRUNPREFIX)%,$(MANTESTPRGS))
</span>
TIGERBINDIR = tiger_only/bin
TIGERBINS := $(wildcard $(TIGERBINDIR)/*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -318,10 +322,17 @@ $(XTESTPRGS_C): %: %.o $(BUILDLIBDIR)
</span> $(MANTESTOBJS_C): %.o: %.c $(ALLHEADERS)
$(CC) -c -std=c99 -fno-builtin -I$(SRCINCDIR) $(CFLAGS) $< -o $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently, the manual tests don't require the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Currently, the manual C tests don't require the library
</span> $(MANTESTPRGS_C): %: %.o $(BUILDLIBDIR)
$(CC) $(MANTESTLDFLAGS) $< -o $@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# But the manual C++ tests *do* require the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(MANTESTOBJS_CPP): %.o: %.cpp $(ALLHEADERS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -c -I$(SRCINCDIR) $(ALLCXXFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(MANTESTPRGS_CPP): %: %.o $(BUILDDLIBPATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(TESTLDFLAGS) $< $(TESTLIBS) -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Dummy target for building Tiger-only binaries, so Portfile can
# reference it in case we need it in the future.
tiger-bins:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -424,7 +435,7 @@ xtest_clean:
</span> $(RM) $(XTESTDIR)/*.o $(XTESTPRGS)
$(MANRUNPREFIX)clean:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $(MANTESTDIR)/*.o $(MANTESTPRGS_C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $(MANTESTDIR)/*.o $(MANTESTPRGS)
</span>
test_clean: xtest_clean $(MANRUNPREFIX)clean
$(RM) $(TESTDIR)/*.o $(TESTPRGS) $(XTESTDIR)/*.o $(XTESTPRGS)
</pre><pre style='margin:0'>
</pre>