<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/cc116eaaf201d6b9f31606958a54bf76ab074635">https://github.com/macports/macports-legacy-support/commit/cc116eaaf201d6b9f31606958a54bf76ab074635</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc116eaaf201d6b9f31606958a54bf76ab074635
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Dec 7 20:44:13 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> Makefile: Create temporary directory for test files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This creates a directory under /tmp which tests can use to write any
</span><span style='display:block; white-space:pre;color:#404040;'> needed files, passing its location to test builds.
</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;'> Directory is created and removed as expected.
</span>---
Makefile | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 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 e2f649d..17da30a 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;'>@@ -79,6 +79,10 @@ SED ?= /usr/bin/sed
</span> GREP ?= /usr/bin/grep
CP ?= /bin/cp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Directory for temporary test files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TEST_TEMP ?= tst_data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TESTCFLAGS = $(ALLCFLAGS) '-DTEST_TEMP="$(TEST_TEMP)"'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> MKINSTALLDIRS = install -d -m 755
INSTALL_PROGRAM = install -c -m 755
INSTALL_DATA = install -c -m 644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +243,7 @@ $(SOBJLIST): $(ALLSLIBOBJS)
</span> if [ ! -s $@ ]; then echo $(DUMMYOBJ) > $@; fi
# Make the directories separate targets to avoid collisions in parallel builds.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(BUILDLIBDIR) $(DESTDIR)$(LIBDIR):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(BUILDLIBDIR) $(DESTDIR)$(LIBDIR) $(TEST_TEMP):
</span> $(MKINSTALLDIRS) $@
$(BUILDDLIBPATH): $(ALLDLIBOBJS) | $(BUILDLIBDIR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,7 +268,7 @@ $(XLIBPATH): $(BUILDSYSLIBPATH)
</span> cd $(XLIBDIR) && ln -sf ../$< ../$@
$(TESTOBJS_C): %.o: %.c $(ALLHEADERS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c -std=c99 -I$(SRCINCDIR) $(ALLCFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c -std=c99 -I$(SRCINCDIR) $(TESTCFLAGS) $< -o $@
</span>
$(TESTPRGS_C): %: %.o $(BUILDDLIBPATH)
$(CC) $(TESTLDFLAGS) $< $(TESTLIBS) -o $@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +282,7 @@ $(TESTSPRGS_C): %_static: %.o $(BUILDSLIBPATH)
</span>
# The "darwin_c" tests need the -fno-builtin option with some compilers.
$(XTESTOBJS_C): %.o: %.c $(ALLHEADERS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c -std=c99 -fno-builtin -I$(SRCINCDIR) $(ALLCFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c -std=c99 -fno-builtin -I$(SRCINCDIR) $(TESTCFLAGS) $< -o $@
</span>
# The xtests don't require the library
$(XTESTPRGS_C): %: %.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,7 +291,7 @@ $(XTESTPRGS_C): %: %.o
</span> # The "darwin_c" tests need the -fno-builtin option with some compilers.
# It shouldn't hurt the other manual tests.
$(MANTESTOBJS_C): %.o: %.c $(ALLHEADERS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c -std=c99 -fno-builtin -I$(SRCINCDIR) $(ALLCFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c -std=c99 -fno-builtin -I$(SRCINCDIR) $(TESTCFLAGS) $< -o $@
</span>
# Currently, the manual C tests don't require the library
$(MANTESTPRGS_C): %: %.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,16 +341,16 @@ test_faccessat_setuid: test/test_faccessat
</span> test_faccessat_setuid_msg:
@echo 'Run "sudo make test_faccessat_setuid" to test faccessat properly (Not on 10.4)'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(TESTRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(TESTRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)% | $(TEST_TEMP)
</span> $< $(TEST_ARGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(TESTSRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(TESTSRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)% | $(TEST_TEMP)
</span> $< $(TEST_ARGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(TESTSYSRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(TESTSYSRUNS): $(TESTRUNPREFIX)%: $(TESTNAMEPREFIX)% | $(TEST_TEMP)
</span> $< $(TEST_ARGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(XTESTRUNS): $(XTESTRUNPREFIX)%: $(XTESTNAMEPREFIX)%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(XTESTRUNS): $(XTESTRUNPREFIX)%: $(XTESTNAMEPREFIX)% | $(TEST_TEMP)
</span> $< $(TEST_ARGS)
# The "dirfuncs_compat" test includes the fdopendir test source
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,7 +410,7 @@ $(TESTRUNPREFIX)stpncpy_chk_all: $(STPNCHKRUNS)
</span> # Provide a target for all "strncpy_chk" tests
$(TESTRUNPREFIX)strncpy_chk_all: $(STRNCHKRUNS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(MANTESTRUNS): $(MANRUNPREFIX)%: $(MANTESTPREFIX)%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(MANTESTRUNS): $(MANRUNPREFIX)%: $(MANTESTPREFIX)% | $(TEST_TEMP)
</span> $< $(TEST_ARGS)
install: install-headers install-lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,6 +459,7 @@ test_clean: xtest_clean $(MANRUNPREFIX)clean
</span> $(RM) $(TESTDIR)/*.o $(ALLTESTPRGS) $(XLIBPATH)
$(RM) test/test_cmath_* test/test_faccessat_setuid
@$(RMDIR) $(XLIBDIR)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) -r $(TEST_TEMP)
</span>
clean: $(MANRUNPREFIX)clean test_clean
$(RM) $(foreach D,$(SRCDIR),$D/*.o $D/*.o.* $D/*.d)
</pre><pre style='margin:0'>
</pre>